diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index c820fc5..9b5dd23 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -6,7 +6,7 @@ jobs: strategy: fail-fast: false matrix: - version: + version: &template_version - drupal-7 - drupal-8 - drupal-9 @@ -21,14 +21,36 @@ jobs: - name: Validate local docker compose files run: | - DC=$(COMPOSE_DOMAIN=test.itkdev.dk docker compose --file templates/${{ matrix.version }}/docker-compose.yml config --quiet 2>&1) + DC=$(COMPOSE_DOMAIN=example.org docker compose --file templates/${{ matrix.version }}/docker-compose.yml config --quiet 2>&1) [ -z "$DC" ] || { echo $DC; exit 1; } - name: Validate server docker compose files run: | - DC=$(COMPOSE_SERVER_DOMAIN=test.itkdev.dk docker compose --file templates/${{ matrix.version }}/docker-compose.server.yml config --quiet 2>&1) + DC=$(COMPOSE_SERVER_DOMAIN=example.org docker compose --file templates/${{ matrix.version }}/docker-compose.server.yml config --quiet 2>&1) [ -z "$DC" ] || { echo $DC; exit 1; } - DC=$(COMPOSE_SERVER_DOMAIN=test.itkdev.dk docker compose --file templates/${{ matrix.version }}/docker-compose.server.yml --file templates/${{ matrix.version }}/docker-compose.dev.yml config --quiet 2>&1) + DC=$(COMPOSE_SERVER_DOMAIN=example.org docker compose --file templates/${{ matrix.version }}/docker-compose.server.yml --file templates/${{ matrix.version }}/docker-compose.dev.yml config --quiet 2>&1) [ -z "$DC" ] || { echo $DC; exit 1; } - DC=$(COMPOSE_SERVER_DOMAIN=test.itkdev.dk docker compose --file templates/${{ matrix.version }}/docker-compose.server.yml --file templates/${{ matrix.version }}/docker-compose.redirect.yml config --quiet 2>&1) + DC=$(COMPOSE_SERVER_DOMAIN=example.org docker compose --file templates/${{ matrix.version }}/docker-compose.server.yml --file templates/${{ matrix.version }}/docker-compose.redirect.yml config --quiet 2>&1) [ -z "$DC" ] || { echo $DC; exit 1; } + + validate-nginx-conf: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + version: *template_version + compose_file: + - docker-compose.yml + - docker-compose.server.yml + + name: Validate nginx conf (${{ matrix.version }}/${{ matrix.compose_file}}) + steps: + - uses: actions/checkout@v5 + + - name: Create docker network + run: | + docker network create frontend + + - name: Validate nginx conf + run: | + COMPOSE_DOMAIN=example.org docker compose --file templates/${{ matrix.version }}/${{ matrix.compose_file}} run --rm nginx nginx -t diff --git a/templates/drupal-10/.docker/nginx.conf b/templates/drupal-10/.docker/nginx.conf index f1f301a..ec278a5 100644 --- a/templates/drupal-10/.docker/nginx.conf +++ b/templates/drupal-10/.docker/nginx.conf @@ -17,7 +17,7 @@ http { include /etc/nginx/mime.types; default_type application/octet-stream; - # Note: set_real_ip_from is only set in the server block to make i configurable + # Note: set_real_ip_from is set in the server block log_format main '$http_x_real_ip - $remote_user [$time_local] "$request" ' '$status $body_bytes_sent "$http_referer" ' diff --git a/templates/drupal-10/.docker/templates/default.conf.template b/templates/drupal-10/.docker/templates/default.conf.template index 2211f14..a8e59f0 100644 --- a/templates/drupal-10/.docker/templates/default.conf.template +++ b/templates/drupal-10/.docker/templates/default.conf.template @@ -7,7 +7,7 @@ server { client_max_body_size ${NGINX_MAX_BODY_SIZE}; set_real_ip_from 172.16.0.0/16; - set_real_ip_from ${NGINX_SET_REAL_IP_FROM:-192.168.39.0/24}; + set_real_ip_from 192.168.39.0/24; real_ip_recursive on; real_ip_header X-Forwarded-For; diff --git a/templates/drupal-11/.docker/nginx.conf b/templates/drupal-11/.docker/nginx.conf index f1f301a..ec278a5 100644 --- a/templates/drupal-11/.docker/nginx.conf +++ b/templates/drupal-11/.docker/nginx.conf @@ -17,7 +17,7 @@ http { include /etc/nginx/mime.types; default_type application/octet-stream; - # Note: set_real_ip_from is only set in the server block to make i configurable + # Note: set_real_ip_from is set in the server block log_format main '$http_x_real_ip - $remote_user [$time_local] "$request" ' '$status $body_bytes_sent "$http_referer" ' diff --git a/templates/drupal-11/.docker/templates/default.conf.template b/templates/drupal-11/.docker/templates/default.conf.template index 2211f14..a8e59f0 100644 --- a/templates/drupal-11/.docker/templates/default.conf.template +++ b/templates/drupal-11/.docker/templates/default.conf.template @@ -7,7 +7,7 @@ server { client_max_body_size ${NGINX_MAX_BODY_SIZE}; set_real_ip_from 172.16.0.0/16; - set_real_ip_from ${NGINX_SET_REAL_IP_FROM:-192.168.39.0/24}; + set_real_ip_from 192.168.39.0/24; real_ip_recursive on; real_ip_header X-Forwarded-For; diff --git a/templates/drupal-7/.docker/nginx.conf b/templates/drupal-7/.docker/nginx.conf index f1f301a..ec278a5 100644 --- a/templates/drupal-7/.docker/nginx.conf +++ b/templates/drupal-7/.docker/nginx.conf @@ -17,7 +17,7 @@ http { include /etc/nginx/mime.types; default_type application/octet-stream; - # Note: set_real_ip_from is only set in the server block to make i configurable + # Note: set_real_ip_from is set in the server block log_format main '$http_x_real_ip - $remote_user [$time_local] "$request" ' '$status $body_bytes_sent "$http_referer" ' diff --git a/templates/drupal-7/.docker/templates/default.conf.template b/templates/drupal-7/.docker/templates/default.conf.template index 7b63998..61c86e9 100644 --- a/templates/drupal-7/.docker/templates/default.conf.template +++ b/templates/drupal-7/.docker/templates/default.conf.template @@ -7,7 +7,7 @@ server { client_max_body_size ${NGINX_MAX_BODY_SIZE}; set_real_ip_from 172.16.0.0/16; - set_real_ip_from ${NGINX_SET_REAL_IP_FROM:-192.168.39.0/24}; + set_real_ip_from 192.168.39.0/24; real_ip_recursive on; real_ip_header X-Forwarded-For; diff --git a/templates/drupal-7/docker-compose.yml b/templates/drupal-7/docker-compose.yml index 8ebe238..44e6d03 100644 --- a/templates/drupal-7/docker-compose.yml +++ b/templates/drupal-7/docker-compose.yml @@ -79,7 +79,7 @@ services: # - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https" memcached: - image: "memcached:latest" + image: memcached:alpine networks: - app ports: diff --git a/templates/drupal-8/.docker/nginx.conf b/templates/drupal-8/.docker/nginx.conf index f1f301a..ec278a5 100644 --- a/templates/drupal-8/.docker/nginx.conf +++ b/templates/drupal-8/.docker/nginx.conf @@ -17,7 +17,7 @@ http { include /etc/nginx/mime.types; default_type application/octet-stream; - # Note: set_real_ip_from is only set in the server block to make i configurable + # Note: set_real_ip_from is set in the server block log_format main '$http_x_real_ip - $remote_user [$time_local] "$request" ' '$status $body_bytes_sent "$http_referer" ' diff --git a/templates/drupal-8/.docker/templates/default.conf.template b/templates/drupal-8/.docker/templates/default.conf.template index 1f1903f..2db085f 100644 --- a/templates/drupal-8/.docker/templates/default.conf.template +++ b/templates/drupal-8/.docker/templates/default.conf.template @@ -7,7 +7,7 @@ server { client_max_body_size ${NGINX_MAX_BODY_SIZE}; set_real_ip_from 172.16.0.0/16; - set_real_ip_from ${NGINX_SET_REAL_IP_FROM:-192.168.39.0/24}; + set_real_ip_from 192.168.39.0/24; real_ip_recursive on; real_ip_header X-Forwarded-For; diff --git a/templates/drupal-8/docker-compose.yml b/templates/drupal-8/docker-compose.yml index a2ee9c5..1995170 100644 --- a/templates/drupal-8/docker-compose.yml +++ b/templates/drupal-8/docker-compose.yml @@ -78,7 +78,7 @@ services: # - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https" memcached: - image: "memcached:latest" + image: memcached:alpine networks: - app ports: diff --git a/templates/drupal-9/.docker/nginx.conf b/templates/drupal-9/.docker/nginx.conf index f1f301a..ec278a5 100644 --- a/templates/drupal-9/.docker/nginx.conf +++ b/templates/drupal-9/.docker/nginx.conf @@ -17,7 +17,7 @@ http { include /etc/nginx/mime.types; default_type application/octet-stream; - # Note: set_real_ip_from is only set in the server block to make i configurable + # Note: set_real_ip_from is set in the server block log_format main '$http_x_real_ip - $remote_user [$time_local] "$request" ' '$status $body_bytes_sent "$http_referer" ' diff --git a/templates/drupal-9/.docker/templates/default.conf.template b/templates/drupal-9/.docker/templates/default.conf.template index 1f1903f..2db085f 100644 --- a/templates/drupal-9/.docker/templates/default.conf.template +++ b/templates/drupal-9/.docker/templates/default.conf.template @@ -7,7 +7,7 @@ server { client_max_body_size ${NGINX_MAX_BODY_SIZE}; set_real_ip_from 172.16.0.0/16; - set_real_ip_from ${NGINX_SET_REAL_IP_FROM:-192.168.39.0/24}; + set_real_ip_from 192.168.39.0/24; real_ip_recursive on; real_ip_header X-Forwarded-For; diff --git a/templates/drupal-9/docker-compose.server.yml b/templates/drupal-9/docker-compose.server.yml index 6dc4546..eb1b260 100644 --- a/templates/drupal-9/docker-compose.server.yml +++ b/templates/drupal-9/docker-compose.server.yml @@ -1,4 +1,4 @@ -# itk-version: 3.2.2 +# itk-version: 3.2.4 networks: frontend: external: true diff --git a/templates/drupal-9/docker-compose.yml b/templates/drupal-9/docker-compose.yml index dff2e96..4fc72c2 100644 --- a/templates/drupal-9/docker-compose.yml +++ b/templates/drupal-9/docker-compose.yml @@ -80,7 +80,7 @@ services: # - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https" memcached: - image: "memcached:latest" + image: memcached:alpine networks: - app ports: diff --git a/templates/symfony-3/.docker/nginx.conf b/templates/symfony-3/.docker/nginx.conf index f1f301a..ec278a5 100644 --- a/templates/symfony-3/.docker/nginx.conf +++ b/templates/symfony-3/.docker/nginx.conf @@ -17,7 +17,7 @@ http { include /etc/nginx/mime.types; default_type application/octet-stream; - # Note: set_real_ip_from is only set in the server block to make i configurable + # Note: set_real_ip_from is set in the server block log_format main '$http_x_real_ip - $remote_user [$time_local] "$request" ' '$status $body_bytes_sent "$http_referer" ' diff --git a/templates/symfony-3/.docker/templates/default.conf.template b/templates/symfony-3/.docker/templates/default.conf.template index 20966f1..8968226 100644 --- a/templates/symfony-3/.docker/templates/default.conf.template +++ b/templates/symfony-3/.docker/templates/default.conf.template @@ -7,7 +7,7 @@ server { client_max_body_size ${NGINX_MAX_BODY_SIZE}; set_real_ip_from 172.16.0.0/16; - set_real_ip_from ${NGINX_SET_REAL_IP_FROM:-192.168.39.0/24}; + set_real_ip_from 192.168.39.0/24; real_ip_recursive on; real_ip_header X-Forwarded-For; diff --git a/templates/symfony-4/.docker/nginx.conf b/templates/symfony-4/.docker/nginx.conf index f1f301a..ec278a5 100644 --- a/templates/symfony-4/.docker/nginx.conf +++ b/templates/symfony-4/.docker/nginx.conf @@ -17,7 +17,7 @@ http { include /etc/nginx/mime.types; default_type application/octet-stream; - # Note: set_real_ip_from is only set in the server block to make i configurable + # Note: set_real_ip_from is set in the server block log_format main '$http_x_real_ip - $remote_user [$time_local] "$request" ' '$status $body_bytes_sent "$http_referer" ' diff --git a/templates/symfony-4/.docker/templates/default.conf.template b/templates/symfony-4/.docker/templates/default.conf.template index 8a49802..3dceda0 100644 --- a/templates/symfony-4/.docker/templates/default.conf.template +++ b/templates/symfony-4/.docker/templates/default.conf.template @@ -7,7 +7,7 @@ server { client_max_body_size ${NGINX_MAX_BODY_SIZE}; set_real_ip_from 172.16.0.0/16; - set_real_ip_from ${NGINX_SET_REAL_IP_FROM:-192.168.39.0/24}; + set_real_ip_from 192.168.39.0/24; real_ip_recursive on; real_ip_header X-Forwarded-For; diff --git a/templates/symfony-6/.docker/nginx.conf b/templates/symfony-6/.docker/nginx.conf index f1f301a..ec278a5 100644 --- a/templates/symfony-6/.docker/nginx.conf +++ b/templates/symfony-6/.docker/nginx.conf @@ -17,7 +17,7 @@ http { include /etc/nginx/mime.types; default_type application/octet-stream; - # Note: set_real_ip_from is only set in the server block to make i configurable + # Note: set_real_ip_from is set in the server block log_format main '$http_x_real_ip - $remote_user [$time_local] "$request" ' '$status $body_bytes_sent "$http_referer" ' diff --git a/templates/symfony-6/.docker/templates/default.conf.template b/templates/symfony-6/.docker/templates/default.conf.template index 8a49802..3dceda0 100644 --- a/templates/symfony-6/.docker/templates/default.conf.template +++ b/templates/symfony-6/.docker/templates/default.conf.template @@ -7,7 +7,7 @@ server { client_max_body_size ${NGINX_MAX_BODY_SIZE}; set_real_ip_from 172.16.0.0/16; - set_real_ip_from ${NGINX_SET_REAL_IP_FROM:-192.168.39.0/24}; + set_real_ip_from 192.168.39.0/24; real_ip_recursive on; real_ip_header X-Forwarded-For;