Skip to content

Commit

Permalink
Specify image versions
Browse files Browse the repository at this point in the history
  • Loading branch information
ElisDN committed Dec 7, 2024
1 parent a974544 commit af2b6bd
Show file tree
Hide file tree
Showing 13 changed files with 22 additions and 22 deletions.
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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
Expand All @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,15 @@ services:
network_mode: service:site

site-node-watch:
image: node:22-alpine
image: node:22-alpine3.20
user: "1000:1000"
volumes:
- ./:/app
working_dir: /app
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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/common/files-backup/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine
FROM alpine:3.20

RUN apk add --no-cache bash aws-cli

Expand Down
2 changes: 1 addition & 1 deletion docker/common/mysql-backup/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine
FROM alpine:3.20

RUN apk add --no-cache bash aws-cli

Expand Down
2 changes: 1 addition & 1 deletion docker/common/redis/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion docker/development/nginx/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/development/php-cli/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/development/php-fpm/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/production/nginx/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:22-alpine as builder
FROM node:22-alpine3.20 as builder

WORKDIR /app

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docker/production/php-cli/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.3-cli-alpine
FROM php:8.3-cli-alpine3.20

ENV MCRYPT_VERSION 1.0.7

Expand Down
4 changes: 2 additions & 2 deletions docker/production/php-fpm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:22-alpine as builder
FROM node:22-alpine3.20 as builder

WORKDIR /app

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docker/testing/php-cli/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.3-cli-alpine
FROM php:8.3-cli-alpine3.20

ENV MCRYPT_VERSION 1.0.7

Expand Down

0 comments on commit af2b6bd

Please sign in to comment.