FreedomCraft/Nameless-Docker-Rootless
3
0
Fork 0
Code Issues Pull Requests Actions Packages Wiki Activity

New tags

Browse Source
This commit is contained in:
Derkades 2020-12-26 15:28:04 +01:00
parent 23b3fc45a2
commit 79e93628cb
4 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -33,7 +33,7 @@ First, follow regular update instructions on the website (uploading files etc).
## Available tags ## Available tags
| Tag | NamelessMC version | PHP version | Tag | NamelessMC version | PHP version
| --- | ------------------ | ----------- | --- | ------------------ | -----------
pr7 | v2.0.0-pr7 | 7.4 v2-pr7 | v2.0.0-pr7 | 7.4
pr8 | v2.0.0-pr8 | 7.4 v2-pr8 | v2.0.0-pr8 | 7.4
pr9dev | v2 development (unstable) | 7.4 v2-pr9dev | v2 development (unstable) | 7.4
pr9dev-php8 | v2 development (unstable) | 8.0 v2-pr9dev-php8 | v2 development (unstable) | 8.0

22
deploy.sh
View File

@ -8,6 +8,22 @@
set -e set -e
export DOCKER_CLI_EXPERIMENTAL=enabled export DOCKER_CLI_EXPERIMENTAL=enabled
docker buildx build -t namelessmc/nginx --platform=linux/arm,linux/arm64,linux/amd64 nginx_web --push
docker buildx build -t namelessmc/php --platform=linux/arm,linux/arm64,linux/amd64 php_fpm --push docker buildx build \
docker buildx build -t namelessmc/php:dev --build-arg VERSION=v2 --platform=linux/arm,linux/arm64,linux/amd64 php_fpm --push -t namelessmc/nginx:v2-pr7 \
-t namelessmc/nginx:v2-pr8 \
-t namelessmc/nginx:v2-pr9dev \
--platform=linux/arm,linux/arm64,linux/amd64 nginx_web --push
deploy_php(){
docker buildx build \
-t namelessmc/php:$1 \
--build-arg PHP_VERSION=$2 --build-arg VERSION=$3 \
--platform=linux/arm,linux/arm64,linux/amd64 php_fpm --push
}
# Tag PHP NamelessMC
deploy_php v2-pr7 7.4 v2.0.0-pr7
deploy_php v2-pr8 7.4 v2.0.0-pr8
deploy_php v2-pr9dev 7.4 v2
deploy_php v2-pr8dev-php8 8.0 v2

4
docker-compose.yml
View File

@ -3,7 +3,7 @@ version: '2'
services: services:
nginx: nginx:
image: namelessmc/nginx image: namelessmc/nginx:v2-pr8
ports: ['80:80'] ports: ['80:80']
volumes: ['./web:/data'] # same as php container volumes: ['./web:/data'] # same as php container
# environment: # environment:
@ -12,7 +12,7 @@ services:
restart: always restart: always
php: php:
image: namelessmc/php image: namelessmc/php:v2-pr8
volumes: ['./web:/data'] # same as web container volumes: ['./web:/data'] # same as web container
restart: always restart: always

12
php_fpm/Dockerfile
View File

@ -1,4 +1,5 @@
FROM php:7.4-fpm ARG PHP_VERSION=7.4
FROM php:${PHP_VERSION}-fpm
RUN BUILD_DEPS="libmcrypt-dev libldap2-dev" && \ RUN BUILD_DEPS="libmcrypt-dev libldap2-dev" && \
RUNTIME_DEPS="libjpeg62-turbo-dev libfreetype6-dev libpng-dev libfreetype6-dev curl tar" && \ RUNTIME_DEPS="libjpeg62-turbo-dev libfreetype6-dev libpng-dev libfreetype6-dev curl tar" && \
@ -10,11 +11,16 @@ RUN BUILD_DEPS="libmcrypt-dev libldap2-dev" && \
apt-get autoremove --purge -y && \ apt-get autoremove --purge -y && \
rm -rf /var/lib/{apt,dpkg,cache,log}/ /tmp/* /var/tmp/* rm -rf /var/lib/{apt,dpkg,cache,log}/ /tmp/* /var/tmp/*
RUN echo "upload_max_filesize = 512M" > /usr/local/etc/php/conf.d/nameless.ini RUN { \
echo "upload_max_filesize = 512M"; \
echo "post_max_size = 512M"; \
echo "max_input_time = 600"; \
echo "max_execution_time = 600"; \
} > /usr/local/etc/php/conf.d/nameless.ini
ADD entrypoint.sh / ADD entrypoint.sh /
ARG VERSION=v2.0.0-pr7 ARG VERSION=v2.0.0-pr8
ENV VERSION=${VERSION} ENV VERSION=${VERSION}
ENTRYPOINT [ "bash", "/entrypoint.sh" ] ENTRYPOINT [ "bash", "/entrypoint.sh" ]