Refactor, use for each folder own container

.env.dist

@@ -1,5 +1,8 @@
 # Copy me to $HOME/.swdc_env to modify configuration
 
+# Use ssl as default
+USE_SSL_DEFAULT=false
+
 # Persistent Database?
 PERSISTENT_DATABASE=true
 
@@ -19,7 +22,7 @@ ENABLE_REDIS=false
 # S3 compatible Server
 ENABLE_MINIO=false
 
-# Possible values are 5.6, 7.0, 7.1, 7.2, 7.3, 7.4
+# Possible values are 7.1, 7.2, 7.3, 7.4
 PHP_VERSION=7.2
 
 # Possible values are 5.5, 5.6, 5.7, 8

.gitignore

@@ -6,4 +6,5 @@
 /images/node_modules
 /docker-compose.override.yaml
 /package-lock.json
-/.env
+/.env
+/nginx/rootfs/etc/nginx/sites-enabled/www.conf

azure-pipelines.yml

@@ -57,10 +57,23 @@ steps:
 
 - task: Docker@2
   condition: eq(variables['MODULE'], 'nginx')
-  displayName: 'Push Nginx Images'
+  displayName: 'Push Nginx Shopware 6 Images'
   inputs:
     containerRegistry: 'Docker Hub'
-    repository: 'shyim/shopware-nginx'
+    repository: 'shopware-platform-nginx'
+    command: 'push'
+    tags: |
+      php71
+      php72
+      php73
+      php74
+
+- task: Docker@2
+  condition: eq(variables['MODULE'], 'nginx')
+  displayName: 'Push Nginx Shopware 5 Images'
+  inputs:
+    containerRegistry: 'Docker Hub'
+    repository: 'shopware-classic-nginx'
     command: 'push'
     tags: |
       php71

functions.sh

@@ -55,3 +55,48 @@ function trim_whitespace() {
     var="${var%"${var##*[![:space:]]}"}"   # remove trailing whitespace characters
     echo -n "$var"
 }
+
+function get_image()
+{
+    folder=$1
+    var="VHOST_${folder^^}_IMAGE"
+    var="${var//-/_}"
+    val=${!var}
+
+    if [[ ! -z $val ]]; then
+        echo $val
+    else
+        IMAGE="shyim/shopware-classic-nginx"
+        if [[ -f "$2/public/index.php" ]]; then
+            IMAGE="shyim/shopware-platform-nginx"
+        fi
+
+        echo "${IMAGE}:php${PHP_VERSION}"
+    fi
+}
+
+function get_hosts()
+{
+    folder=$1
+    var="VHOST_${folder^^}_HOSTS"
+    var="${var//-/_}"
+    val=${!var}
+
+    if [[ ! -z $val ]]; then
+        echo $val
+    else
+        echo "${folder}.dev.localhost"
+    fi
+}
+
+function get_url()
+{
+    hosts=$(get_hosts $1)
+    host=$(cut -d ',' -f 1 <<< "${hosts}")
+
+    if [[ $USE_SSL_DEFAULT == "true" ]]; then
+        echo "https://${host}"
+    else
+        echo "http://${host}"
+    fi
+}

images/build.sh

@@ -17,12 +17,20 @@ for t in ${phpVersions[@]}; do
 
     if [[ $1 == "nginx" || $1 == "all" ]]; then
         echo "Building nginx container for $t"
-        docker build -t shyim/shopware-nginx:${t} -f ./nginx/${t}/Dockerfile ./nginx/
+        cp nginx/10-classic.conf nginx/rootfs/etc/nginx/sites-enabled/www.conf
+        docker build -t shyim/shopware-classic-nginx:${t} -f ./nginx/${t}/Dockerfile ./nginx/
+
+        cp nginx/10-platform.conf nginx/rootfs/etc/nginx/sites-enabled/www.conf
+        docker build -t shyim/shopware-platform-nginx:${t} -f ./nginx/${t}/Dockerfile ./nginx/
     fi
 
     if [[ $1 == "xdebug" || $1 == "all" ]]; then
         if [[ -d "./nginx/${t}-xdebug" ]]; then
-            docker build -t shyim/shopware-nginx:${t}-xdebug -f ./nginx/${t}-xdebug/Dockerfile ./nginx/
+            cp nginx/10-classic.conf nginx/rootfs/etc/nginx/sites-enabled/www.conf
+            docker build -t shyim/shopware-classic-nginx:${t}-xdebug -f ./nginx/${t}-xdebug/Dockerfile ./nginx/
+
+            cp nginx/10-platform.conf nginx/rootfs/etc/nginx/sites-enabled/www.conf
+            docker build -t shyim/shopware-platform-nginx:${t}-xdebug -f ./nginx/${t}-xdebug/Dockerfile ./nginx/
         fi
     fi
 

images/nginx/10-classic.conf

@@ -0,0 +1,12 @@
+server {
+    listen 80;
+
+    server_name localhost;
+    root /var/www/html/;
+
+    set $shopware_env 'docker';
+    set $fpm_upstream 127.0.0.1:9000;
+
+    ## Include shopware configuration.
+    include global/shopware.conf;
+}

images/nginx/10-platform.conf

@@ -0,0 +1,37 @@
+server {
+    listen 80;
+
+    index index.php index.html;
+    server_name localhost;
+    root /var/www/html/public;
+
+    # Shopware install / update
+    location /recovery/install {
+        index index.php;
+        try_files $uri /recovery/install/index.php$is_args$args;
+    }
+
+    location /recovery/update/ {
+        location /recovery/update/assets {
+        }
+        if (!-e $request_filename){
+            rewrite . /recovery/update/index.php last;
+        }
+    }
+
+    location / {
+        try_files $uri /index.php$is_args$args;
+    }
+
+    location ~ \.php$ {
+        fastcgi_split_path_info ^(.+\.php)(/.+)$;
+        include fastcgi.conf;
+        fastcgi_param HTTP_PROXY "";
+        fastcgi_buffers 8 16k;
+        fastcgi_buffer_size 32k;
+        client_max_body_size 24M;
+        client_body_buffer_size 128k;
+        fastcgi_pass 127.0.0.1:9000;
+        http2_push_preload on;
+    }
+}

images/nginx/Dockerfile.twig

@@ -1,7 +1,5 @@
 FROM php:{{ phpVersion }}-fpm-alpine
 
-ENV SHOPWARE_ENV docker
-
 COPY --from=ochinchina/supervisord:latest /usr/local/bin/supervisord /usr/bin/supervisord
 
 RUN set -x && \
@@ -118,5 +116,4 @@ ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php
 COPY rootfs/ /
 EXPOSE 80
 
-ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"]