diff --git a/Makefile b/Makefile index 60e59348..bab46265 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ push-dev-cache: docker compose push app-clear: - docker run --rm -v ${PWD}:/app -w /app alpine sh -c 'rm -rf .ready var/* public/assets/* public/build/* public/upload/* tests/_output/* tests/_support/_generated/*' + docker run --rm -v ${PWD}:/app -w /app alpine:3.20 sh -c 'rm -rf .ready var/* public/assets/* public/build/* public/upload/* tests/_output/* tests/_support/_generated/*' app-init: \ app-permissions \ @@ -46,7 +46,7 @@ app-init: \ app-assets-build app-permissions: - docker run --rm -v ${PWD}:/app -w /app alpine sh -c 'mkdir -p public/build && chmod 777 var public/assets public/build public/upload tests/_output tests/_support/_generated' + docker run --rm -v ${PWD}:/app -w /app alpine:3.20 sh -c 'mkdir -p public/build && chmod 777 var public/assets public/build public/upload tests/_output tests/_support/_generated' app-composer-install: docker compose run --rm site-php-cli composer install @@ -72,15 +72,15 @@ app-migrations: app-fixtures: docker compose run --rm site-php-cli composer app fixture/load '*' -- --interactive=0 docker compose run --rm site-php-cli composer app cache/flush cache -- --interactive=0 - docker run --rm -v ${PWD}:/app -w /app alpine sh -c 'rm -rf public/upload/* && cp -rf demo/upload/* public/upload' - docker run --rm -v ${PWD}:/app -w /app alpine sh -c 'find public/upload -type d -exec chmod 777 {} \;' - docker run --rm -v ${PWD}:/app -w /app alpine sh -c 'find public/upload -type f -exec chmod 666 {} \;' + docker run --rm -v ${PWD}:/app -w /app alpine:3.20 sh -c 'rm -rf public/upload/* && cp -rf demo/upload/* public/upload' + docker run --rm -v ${PWD}:/app -w /app alpine:3.20 sh -c 'find public/upload -type d -exec chmod 777 {} \;' + docker run --rm -v ${PWD}:/app -w /app alpine:3.20 sh -c 'find public/upload -type f -exec chmod 666 {} \;' app-assets-build: docker compose run --rm site-node-cli yarn build app-ready: - docker run --rm -v ${PWD}:/app --workdir=/app alpine touch .ready + docker run --rm -v ${PWD}:/app --workdir=/app alpine:3.20 touch .ready app-check: \ app-composer-validate \ diff --git a/docker-compose-testing.yml b/docker-compose-testing.yml index 8dfb4e75..2385f5e6 100644 --- a/docker-compose-testing.yml +++ b/docker-compose-testing.yml @@ -151,7 +151,7 @@ services: - traefik.http.services.site-mailer.loadbalancer.server.port=80 site-wiremock: - image: wiremock/wiremock:latest-alpine + image: wiremock/wiremock:3.10.0-alpine networks: - traefik-public - default diff --git a/docker-compose.yml b/docker-compose.yml index 4dff008e..0d6e1323 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -112,7 +112,7 @@ services: network_mode: service:site site-node-watch: - image: node:22-alpine + image: node:22-alpine3.20 user: "1000:1000" volumes: - ./:/app @@ -120,7 +120,7 @@ services: command: sh -c 'until [ -f .ready ] ; do sleep 1 ; done && npm run watch' site-node-cli: - image: node:22-alpine + image: node:22-alpine3.20 user: "1000:1000" volumes: - ./:/app @@ -239,7 +239,7 @@ services: - traefik.http.services.site-backup-storage.loadbalancer.server.port=80 site-wiremock: - image: wiremock/wiremock:latest-alpine + image: wiremock/wiremock:3.10.0-alpine networks: - traefik-public - default diff --git a/docker/common/files-backup/Dockerfile b/docker/common/files-backup/Dockerfile index 88fbbefd..cb608a92 100644 --- a/docker/common/files-backup/Dockerfile +++ b/docker/common/files-backup/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine +FROM alpine:3.20 RUN apk add --no-cache bash aws-cli diff --git a/docker/common/mysql-backup/Dockerfile b/docker/common/mysql-backup/Dockerfile index 8f2940c6..f62134e0 100644 --- a/docker/common/mysql-backup/Dockerfile +++ b/docker/common/mysql-backup/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine +FROM alpine:3.20 RUN apk add --no-cache bash aws-cli diff --git a/docker/common/redis/Dockerfile b/docker/common/redis/Dockerfile index 745685fc..ba033ee8 100644 --- a/docker/common/redis/Dockerfile +++ b/docker/common/redis/Dockerfile @@ -1,4 +1,4 @@ -FROM redis:7.0-alpine +FROM redis:7.0-alpine3.20 COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh RUN chmod +x /usr/local/bin/docker-entrypoint.sh diff --git a/docker/development/nginx/Dockerfile b/docker/development/nginx/Dockerfile index 12dfe855..8e5da0fe 100644 --- a/docker/development/nginx/Dockerfile +++ b/docker/development/nginx/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx:1.27-alpine +FROM nginx:1.27-alpine3.20 COPY ./common/nginx/snippets /etc/nginx/snippets COPY ./common/nginx/conf.d /etc/nginx/conf.d diff --git a/docker/development/php-cli/Dockerfile b/docker/development/php-cli/Dockerfile index be2adfbf..32106a6f 100644 --- a/docker/development/php-cli/Dockerfile +++ b/docker/development/php-cli/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.3-cli-alpine +FROM php:8.3-cli-alpine3.20 ENV MCRYPT_VERSION 1.0.7 ENV XDEBUG_VERSION 3.3.2 diff --git a/docker/development/php-fpm/Dockerfile b/docker/development/php-fpm/Dockerfile index 58fbdd36..84c4043e 100644 --- a/docker/development/php-fpm/Dockerfile +++ b/docker/development/php-fpm/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.3-fpm-alpine +FROM php:8.3-fpm-alpine3.20 ENV MCRYPT_VERSION 1.0.7 ENV XDEBUG_VERSION 3.3.2 diff --git a/docker/production/nginx/Dockerfile b/docker/production/nginx/Dockerfile index eebda469..3a5a0f6a 100644 --- a/docker/production/nginx/Dockerfile +++ b/docker/production/nginx/Dockerfile @@ -1,4 +1,4 @@ -FROM node:22-alpine as builder +FROM node:22-alpine3.20 as builder WORKDIR /app @@ -8,7 +8,7 @@ RUN yarn install && yarn cache clean COPY ./ ./ RUN yarn build -FROM nginx:1.27-alpine +FROM nginx:1.27-alpine3.20 RUN apk add --no-cache curl diff --git a/docker/production/php-cli/Dockerfile b/docker/production/php-cli/Dockerfile index bb8b0ad3..2616d6a0 100644 --- a/docker/production/php-cli/Dockerfile +++ b/docker/production/php-cli/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.3-cli-alpine +FROM php:8.3-cli-alpine3.20 ENV MCRYPT_VERSION 1.0.7 diff --git a/docker/production/php-fpm/Dockerfile b/docker/production/php-fpm/Dockerfile index 1f4e77b6..f67d80a4 100644 --- a/docker/production/php-fpm/Dockerfile +++ b/docker/production/php-fpm/Dockerfile @@ -1,4 +1,4 @@ -FROM node:22-alpine as builder +FROM node:22-alpine3.20 as builder WORKDIR /app @@ -8,7 +8,7 @@ RUN yarn install && yarn cache clean COPY ./ ./ RUN yarn build -FROM php:8.3-fpm-alpine +FROM php:8.3-fpm-alpine3.20 ENV MCRYPT_VERSION 1.0.7 diff --git a/docker/testing/php-cli/Dockerfile b/docker/testing/php-cli/Dockerfile index 98661cde..eea7a633 100644 --- a/docker/testing/php-cli/Dockerfile +++ b/docker/testing/php-cli/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.3-cli-alpine +FROM php:8.3-cli-alpine3.20 ENV MCRYPT_VERSION 1.0.7