Skip to content

Commit

Permalink
Update images
Browse files Browse the repository at this point in the history
  • Loading branch information
ElisDN committed Sep 10, 2024
1 parent 0552bf8 commit 601b747
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion docker-compose-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ services:
constraints: [ node.role == manager ]

site-mysql:
image: mariadb:10
image: mariadb:11
environment:
MYSQL_ROOT_PASSWORD_FILE: /run/secrets/db_root_password
MYSQL_USER: app
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ services:
network_mode: service:site

site-mysql:
image: mariadb:10
image: mariadb:11
volumes:
- site-mysql:/var/lib/mysql
environment:
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,22 +112,22 @@ services:
network_mode: service:site

site-node-watch:
image: node:21-alpine
image: node:22-alpine
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:21-alpine
image: node:22-alpine
user: "1000:1000"
volumes:
- ./:/app
working_dir: /app

site-mysql:
image: mariadb:10
image: mariadb:11
volumes:
- site-mysql:/var/lib/mysql
environment:
Expand Down
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.25-alpine
FROM nginx:1.27-alpine

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,7 +1,7 @@
FROM php:8.3-cli-alpine

ENV MCRYPT_VERSION 1.0.7
ENV XDEBUG_VERSION 3.3.0
ENV XDEBUG_VERSION 3.3.2

RUN apk add --no-cache mariadb-client libjpeg-turbo-dev libpng-dev libwebp-dev freetype-dev libmcrypt-dev icu-dev git linux-headers \
&& git clone -b $MCRYPT_VERSION --depth 1 https://github.com/php/pecl-encryption-mcrypt.git /usr/src/php/ext/mcrypt \
Expand Down
2 changes: 1 addition & 1 deletion docker/development/php-fpm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM php:8.3-fpm-alpine

ENV MCRYPT_VERSION 1.0.7
ENV XDEBUG_VERSION 3.3.0
ENV XDEBUG_VERSION 3.3.2

RUN apk add --no-cache mariadb-client libjpeg-turbo-dev libpng-dev libwebp-dev freetype-dev libmcrypt-dev icu-dev git linux-headers \
&& git clone -b $MCRYPT_VERSION --depth 1 https://github.com/php/pecl-encryption-mcrypt.git /usr/src/php/ext/mcrypt \
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:21-alpine as builder
FROM node:22-alpine as builder

WORKDIR /app

Expand All @@ -8,7 +8,7 @@ RUN yarn install && yarn cache clean
COPY ./ ./
RUN yarn build

FROM nginx:1.25-alpine
FROM nginx:1.27-alpine

RUN apk add --no-cache curl

Expand Down
2 changes: 1 addition & 1 deletion docker/production/php-fpm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:21-alpine as builder
FROM node:22-alpine as builder

WORKDIR /app

Expand Down

0 comments on commit 601b747

Please sign in to comment.