New tags

README.md

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

deploy.sh

@@ -8,6 +8,22 @@
 set -e
 
 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 -t namelessmc/php:dev --build-arg VERSION=v2 --platform=linux/arm,linux/arm64,linux/amd64 php_fpm --push
+
+docker buildx build \
+        -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

docker-compose.yml

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

php_fpm/Dockerfile

@@ -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" && \
     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 && \
     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 /
 
-ARG VERSION=v2.0.0-pr7
+ARG VERSION=v2.0.0-pr8
 ENV VERSION=${VERSION}
 
 ENTRYPOINT [ "bash", "/entrypoint.sh" ]