V7-500

docker-compose.yaml

@@ -97,6 +97,7 @@ services:
       - ./docker/nginx/site.conf:/etc/nginx/conf.d/default.conf:cached
     environment:
       - VIRTUAL_HOST=${API_VIRTUAL_HOST}
+      - HTTPS_METHOD=noredirect
     depends_on:
       - php
 
@@ -115,6 +116,7 @@ services:
       - VIRTUAL_HOST=${ADMIN_VIRTUAL_HOST}
       - VIRTUAL_PORT=${ADMIN_PORT}
       - NODE_ENV=docker
+      - HTTPS_METHOD=noredirect
     depends_on:
       - api
 

docker/php/Dockerfile

@@ -26,13 +26,13 @@ RUN sed 's/main$/main universe/' -i /etc/apt/sources.list; \
     php -r "unlink('composer-setup.php');"; \
     mv composer.phar /usr/local/bin/composer; \
     ## GIT, NANO, ACL, PROPCS, LIBZIP, IMAGICK
-    apt-get install-y --no-install-recommends git nano acl procps libzip-dev zip libmagickwand-dev imagemagick libtidy-dev; \
+    apt-get install -y --no-install-recommends git nano acl procps libzip-dev zip libmagickwand-dev imagemagick libtidy-dev; \
     ## OP CACHE, PDO, BC MATH, CALENDAR, TODY
+    docker-php-ext-configure zip --with-libzip; \
+    docker-php-ext-configure intl; \
     docker-php-ext-install opcache pdo_mysql mbstring exif bcmath calendar gd intl tidy zip; \
     docker-php-ext-enable exif; \
-    docker-php-ext-configure intl; \
     docker-php-ext-enable tidy; \
-    docker-php-ext-configure zip --with-libzip; \
     # IMAGICK
     pecl install imagick-3.4.3RC2; \
     docker-php-ext-enable imagick; \