Merge pull request #48 from aakb/feature/docker-server

cableman · web-flow · commit 9cbcd3a1197e · 2021-01-28T10:14:20.000+01:00
SERV-388: Added docker compose server files
diff --git a/php5.6-fpm/alpine/Dockerfile b/php5.6-fpm/alpine/Dockerfile
@@ -18,7 +18,9 @@ ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="1" \
     PHP_PM_MIN_SPARE_SERVERS="5" \
     PHP_PM_MAX_SPARE_SERVERS="8" \
     PHP_REQUEST_SLOWLOG_TIMEOUT="0" \
-    PHP_SLOWLOG="/var/log/php-slow.log"
+    PHP_SLOWLOG="/var/log/php-slow.log" \
+    PHP_USER="deploy" \
+    PHP_GROUP="deploy"
 
 RUN apk --update add --no-cache \
         libxslt-dev \
@@ -65,6 +67,10 @@ COPY etc/php/conf.d/php.ini /usr/local/etc/php/conf.d/20-php.ini
 # Custom FPM configuration.
 COPY etc/php-fpm.d/fpm.ini /usr/local/etc/php-fpm.d/zz-fpm-docker.conf
 
+# Add deploy use to match server.
+RUN addgroup -g 1001 deploy \
+&& adduser -G deploy -u 1001 -H deploy -D
+
 EXPOSE 9000
 
 WORKDIR /app
diff --git a/php5.6-fpm/alpine/etc/php-fpm.d/fpm.ini b/php5.6-fpm/alpine/etc/php-fpm.d/fpm.ini
@@ -11,3 +11,6 @@ slowlog = ${PHP_SLOWLOG}
 
 ; Enable the FPM status page
 pm.status_path = /status
+
+user = ${PHP_USER}
+group = ${PHP_GROUP}
diff --git a/php7.0-fpm/alpine/Dockerfile b/php7.0-fpm/alpine/Dockerfile
@@ -18,7 +18,9 @@ ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="1" \
     PHP_PM_MIN_SPARE_SERVERS="5" \
     PHP_PM_MAX_SPARE_SERVERS="8" \
     PHP_REQUEST_SLOWLOG_TIMEOUT="0" \
-    PHP_SLOWLOG="/var/log/php-slow.log"
+    PHP_SLOWLOG="/var/log/php-slow.log" \
+    PHP_USER="deploy" \
+    PHP_GROUP="deploy"
 
 RUN apk --update add --no-cache \
         libxslt-dev \
@@ -64,6 +66,10 @@ COPY etc/php/conf.d/php.ini /usr/local/etc/php/conf.d/20-php.ini
 # Custom FPM configuration.
 COPY etc/php-fpm.d/fpm.ini /usr/local/etc/php-fpm.d/zz-fpm-docker.conf
 
+# Add deploy use to match server.
+RUN addgroup -g 1001 deploy \
+&& adduser -G deploy -u 1001 -H deploy -D
+
 EXPOSE 9000
 
 WORKDIR /app
diff --git a/php7.0-fpm/alpine/etc/php-fpm.d/fpm.ini b/php7.0-fpm/alpine/etc/php-fpm.d/fpm.ini
@@ -11,3 +11,6 @@ slowlog = ${PHP_SLOWLOG}
 
 ; Enable the FPM status page
 pm.status_path = /status
+
+user = ${PHP_USER}
+group = ${PHP_GROUP}
diff --git a/php7.2-fpm/alpine/Dockerfile b/php7.2-fpm/alpine/Dockerfile
@@ -18,7 +18,9 @@ ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="1" \
     PHP_PM_MIN_SPARE_SERVERS="5" \
     PHP_PM_MAX_SPARE_SERVERS="8" \
     PHP_REQUEST_SLOWLOG_TIMEOUT="0" \
-    PHP_SLOWLOG="/var/log/php-slow.log"
+    PHP_SLOWLOG="/var/log/php-slow.log" \
+    PHP_USER="deploy" \
+    PHP_GROUP="deploy"
 
 RUN apk --update add --no-cache \
         libxslt-dev \
@@ -64,6 +66,10 @@ COPY etc/php/conf.d/php.ini /usr/local/etc/php/conf.d/20-php.ini
 # Custom FPM configuration.
 COPY etc/php-fpm.d/fpm.ini /usr/local/etc/php-fpm.d/zz-fpm-docker.conf
 
+# Add deploy use to match server.
+RUN addgroup -g 1001 deploy \
+&& adduser -G deploy -u 1001 -H deploy -D
+
 EXPOSE 9000
 
 WORKDIR /app
diff --git a/php7.2-fpm/alpine/etc/php-fpm.d/fpm.ini b/php7.2-fpm/alpine/etc/php-fpm.d/fpm.ini
@@ -11,3 +11,6 @@ slowlog = ${PHP_SLOWLOG}
 
 ; Enable the FPM status page
 pm.status_path = /status
+
+user = ${PHP_USER}
+group = ${PHP_GROUP}
diff --git a/php7.3-fpm/alpine/Dockerfile b/php7.3-fpm/alpine/Dockerfile
@@ -18,7 +18,9 @@ ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="1" \
     PHP_PM_MIN_SPARE_SERVERS="5" \
     PHP_PM_MAX_SPARE_SERVERS="8" \
     PHP_REQUEST_SLOWLOG_TIMEOUT="0" \
-    PHP_SLOWLOG="/var/log/php-slow.log"
+    PHP_SLOWLOG="/var/log/php-slow.log" \
+    PHP_USER="deploy" \
+    PHP_GROUP="deploy"
 
 RUN apk --update add --no-cache \
         libxslt-dev \
@@ -64,6 +66,10 @@ COPY etc/php/conf.d/php.ini /usr/local/etc/php/conf.d/20-php.ini
 # Custom FPM configuration.
 COPY etc/php-fpm.d/fpm.ini /usr/local/etc/php-fpm.d/zz-fpm-docker.conf
 
+# Add deploy use to match server.
+RUN addgroup -g 1001 deploy \
+&& adduser -G deploy -u 1001 -H deploy -D
+
 EXPOSE 9000
 
 WORKDIR /app
diff --git a/php7.3-fpm/alpine/etc/php-fpm.d/fpm.ini b/php7.3-fpm/alpine/etc/php-fpm.d/fpm.ini
@@ -11,3 +11,6 @@ slowlog = ${PHP_SLOWLOG}
 
 ; Enable the FPM status page
 pm.status_path = /status
+
+user = ${PHP_USER}
+group = ${PHP_GROUP}
diff --git a/php7.4-fpm/alpine/Dockerfile b/php7.4-fpm/alpine/Dockerfile
@@ -18,7 +18,9 @@ ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="1" \
     PHP_PM_MIN_SPARE_SERVERS="5" \
     PHP_PM_MAX_SPARE_SERVERS="8" \
     PHP_REQUEST_SLOWLOG_TIMEOUT="0" \
-    PHP_SLOWLOG="/var/log/php-slow.log"
+    PHP_SLOWLOG="/var/log/php-slow.log" \
+    PHP_USER="deploy" \
+    PHP_GROUP="deploy"
 
 RUN apk --update add --no-cache \
         libxslt-dev \
@@ -64,6 +66,10 @@ COPY etc/php/conf.d/php.ini /usr/local/etc/php/conf.d/20-php.ini
 # Custom FPM configuration.
 COPY etc/php-fpm.d/fpm.ini /usr/local/etc/php-fpm.d/zz-fpm-docker.conf
 
+# Add deploy use to match server.
+RUN addgroup -g 1001 deploy \
+&& adduser -G deploy -u 1001 -H deploy -D
+
 EXPOSE 9000
 
 WORKDIR /app
diff --git a/php7.4-fpm/alpine/etc/php-fpm.d/fpm.ini b/php7.4-fpm/alpine/etc/php-fpm.d/fpm.ini
@@ -11,3 +11,6 @@ slowlog = ${PHP_SLOWLOG}
 
 ; Enable the FPM status page
 pm.status_path = /status
+
+user = ${PHP_USER}
+group = ${PHP_GROUP}
diff --git a/php8.0-fpm/alpine/Dockerfile b/php8.0-fpm/alpine/Dockerfile
@@ -18,7 +18,9 @@ ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="1" \
     PHP_PM_MIN_SPARE_SERVERS="5" \
     PHP_PM_MAX_SPARE_SERVERS="8" \
     PHP_REQUEST_SLOWLOG_TIMEOUT="0" \
-    PHP_SLOWLOG="/var/log/php-slow.log"
+    PHP_SLOWLOG="/var/log/php-slow.log" \
+    PHP_USER="deploy" \
+    PHP_GROUP="deploy"
 
 RUN apk --update add --no-cache \
         libxslt-dev \
@@ -64,6 +66,10 @@ COPY etc/php/conf.d/php.ini /usr/local/etc/php/conf.d/20-php.ini
 # Custom FPM configuration.
 COPY etc/php-fpm.d/fpm.ini /usr/local/etc/php-fpm.d/zz-fpm-docker.conf
 
+# Add deploy use to match server.
+RUN addgroup -g 1001 deploy \
+&& adduser -G deploy -u 1001 -H deploy -D
+
 EXPOSE 9000
 
 WORKDIR /app
diff --git a/php8.0-fpm/alpine/etc/php-fpm.d/fpm.ini b/php8.0-fpm/alpine/etc/php-fpm.d/fpm.ini
@@ -11,3 +11,6 @@ slowlog = ${PHP_SLOWLOG}
 
 ; Enable the FPM status page
 pm.status_path = /status
+
+user = ${PHP_USER}
+group = ${PHP_GROUP}
diff --git a/templates/drupal-7/docker-compose.server.yml b/templates/drupal-7/docker-compose.server.yml
@@ -0,0 +1,70 @@
+version: "3"
+
+networks:
+  frontend:
+    external: true
+  app:
+    driver: bridge
+    internal: true
+    external: false
+
+services:
+  phpfpm:
+    image: itkdev/php7.4-fpm:alpine
+    restart: unless-stopped
+    networks:
+      - app
+    environment:
+      - PHP_MAX_EXECUTION_TIME=30
+      - PHP_MEMORY_LIMIT=128M
+    depends_on:
+      - memcached
+    volumes:
+      - .:/app:delegated
+      - drush-cache:/root/.drush
+
+  nginx:
+    image: nginx:stable-alpine
+    restart: unless-stopped
+    networks:
+      - app
+      - frontend
+    depends_on:
+      - phpfpm
+    ports:
+      - '80'
+    volumes:
+      - ${PWD}/.docker/vhost.conf:/etc/nginx/conf.d/default.conf:ro
+      - ./:/app:rw
+    labels:
+      - "traefik.enable=true"
+      - "traefik.docker.network=frontend"
+      - "traefik.http.routers.${COMPOSE_PROJECT_NAME}.rule=Host(`${COMPOSE_SERVER_DOMAIN}`)"
+      - "traefik.http.routers.${COMPOSE_PROJECT_NAME}.entrypoints=websecure"
+      #- "traefik.http.routers.${COMPOSE_PROJECT_NAME}.middlewares=ITKBasicAuth@file"
+
+  memcached:
+    image: 'memcached:latest'
+    restart: unless-stopped
+    networks:
+      - app
+    ports:
+      - '11211'
+    environment:
+      - MEMCACHED_CACHE_SIZE=64
+
+  drush:
+    image: itkdev/drush6:latest
+    networks:
+      - app
+    depends_on:
+      - mariadb
+    entrypoint:
+      - drush
+    volumes:
+      - drush-cache:/root/.drush
+      - ./:/app
+
+# Drush cache volume to persist cache between runs.
+volumes:
+  drush-cache:
diff --git a/templates/drupal-7/docker-compose.yml b/templates/drupal-7/docker-compose.yml
@@ -12,7 +12,6 @@ services:
     image: itkdev/mariadb:latest
     networks:
       - app
-      - frontend
     ports:
       - '3306'
     environment:
@@ -36,6 +35,7 @@ services:
       - DOCKER_HOST_DOMAIN=${COMPOSE_DOMAIN}
     depends_on:
       - mariadb
+      - memcached
     volumes:
       - .:/app:delegated
 
@@ -46,7 +46,6 @@ services:
       - frontend
     depends_on:
       - phpfpm
-      - memcached
     ports:
       - '80'
     volumes:
@@ -57,7 +56,6 @@ services:
       - "traefik.docker.network=frontend"
       - "traefik.http.routers.${COMPOSE_PROJECT_NAME}.rule=Host(`${COMPOSE_DOMAIN}`)"
 
-
   memcached:
     image: 'memcached:latest'
     networks:
diff --git a/templates/drupal-8/docker-compose.server.yml b/templates/drupal-8/docker-compose.server.yml
@@ -0,0 +1,70 @@
+version: "3"
+
+networks:
+  frontend:
+    external: true
+  app:
+    driver: bridge
+    internal: true
+    external: false
+
+services:
+  phpfpm:
+    image: itkdev/php7.4-fpm:alpine
+    restart: unless-stopped
+    networks:
+      - app
+    environment:
+      - PHP_MAX_EXECUTION_TIME=30
+      - PHP_MEMORY_LIMIT=128M
+    depends_on:
+      - memcached
+    volumes:
+      - .:/app:delegated
+      - drush-cache:/root/.drush
+
+  nginx:
+    image: nginx:stable-alpine
+    restart: unless-stopped
+    networks:
+      - app
+      - frontend
+    depends_on:
+      - phpfpm
+    ports:
+      - '80'
+    volumes:
+      - ${PWD}/.docker/vhost.conf:/etc/nginx/conf.d/default.conf:ro
+      - ./:/app:rw
+    labels:
+      - "traefik.enable=true"
+      - "traefik.docker.network=frontend"
+      - "traefik.http.routers.${COMPOSE_PROJECT_NAME}.rule=Host(`${COMPOSE_SERVER_DOMAIN}`)"
+      - "traefik.http.routers.${COMPOSE_PROJECT_NAME}.entrypoints=websecure"
+      #- "traefik.http.routers.${COMPOSE_PROJECT_NAME}.middlewares=ITKBasicAuth@file"
+
+  memcached:
+    image: 'memcached:latest'
+    restart: unless-stopped
+    networks:
+      - app
+    ports:
+      - '11211'
+    environment:
+      - MEMCACHED_CACHE_SIZE=64
+
+  drush:
+    image: itkdev/drush6:latest
+    networks:
+      - app
+    depends_on:
+      - mariadb
+    entrypoint:
+      - drush
+    volumes:
+      - drush-cache:/root/.drush
+      - ./:/app
+
+# Drush cache volume to persist cache between runs.
+volumes:
+  drush-cache:
diff --git a/templates/drupal-8/docker-compose.yml b/templates/drupal-8/docker-compose.yml
@@ -12,7 +12,6 @@ services:
     image: itkdev/mariadb:latest
     networks:
       - app
-      - frontend
     ports:
       - '3306'
     environment:
@@ -37,6 +36,7 @@ services:
       - COMPOSER_VERSION=1
     depends_on:
       - mariadb
+      - memcached
     volumes:
       - .:/app:delegated
       - drush-cache:/root/.drush
@@ -48,7 +48,6 @@ services:
       - frontend
     depends_on:
       - phpfpm
-      - memcached
     ports:
       - '80'
     volumes:
diff --git a/templates/symfony-3/docker-compose.server.yml b/templates/symfony-3/docker-compose.server.yml
diff --git a/templates/symfony-3/docker-compose.yml b/templates/symfony-3/docker-compose.yml
diff --git a/templates/symfony-4/docker-compose.server.yml b/templates/symfony-4/docker-compose.server.yml
diff --git a/templates/symfony-4/docker-compose.yml b/templates/symfony-4/docker-compose.yml
