From 601b747445aaa43967169feb019a691874978ee6 Mon Sep 17 00:00:00 2001 From: ElisDN Date: Tue, 10 Sep 2024 16:00:17 +0300 Subject: [PATCH] Update images --- docker-compose-production.yml | 2 +- docker-compose-testing.yml | 2 +- docker-compose.yml | 6 +++--- docker/development/nginx/Dockerfile | 2 +- docker/development/php-cli/Dockerfile | 2 +- docker/development/php-fpm/Dockerfile | 2 +- docker/production/nginx/Dockerfile | 4 ++-- docker/production/php-fpm/Dockerfile | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docker-compose-production.yml b/docker-compose-production.yml index d5bca91a..2326ad03 100644 --- a/docker-compose-production.yml +++ b/docker-compose-production.yml @@ -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 diff --git a/docker-compose-testing.yml b/docker-compose-testing.yml index e45ae787..8dfb4e75 100644 --- a/docker-compose-testing.yml +++ b/docker-compose-testing.yml @@ -113,7 +113,7 @@ services: network_mode: service:site site-mysql: - image: mariadb:10 + image: mariadb:11 volumes: - site-mysql:/var/lib/mysql environment: diff --git a/docker-compose.yml b/docker-compose.yml index e8d168c1..4dff008e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -112,7 +112,7 @@ services: network_mode: service:site site-node-watch: - image: node:21-alpine + image: node:22-alpine user: "1000:1000" volumes: - ./:/app @@ -120,14 +120,14 @@ services: 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: diff --git a/docker/development/nginx/Dockerfile b/docker/development/nginx/Dockerfile index a623d46e..12dfe855 100644 --- a/docker/development/nginx/Dockerfile +++ b/docker/development/nginx/Dockerfile @@ -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 diff --git a/docker/development/php-cli/Dockerfile b/docker/development/php-cli/Dockerfile index dd671be7..737d1820 100644 --- a/docker/development/php-cli/Dockerfile +++ b/docker/development/php-cli/Dockerfile @@ -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 \ diff --git a/docker/development/php-fpm/Dockerfile b/docker/development/php-fpm/Dockerfile index e4a73f83..3733bd25 100644 --- a/docker/development/php-fpm/Dockerfile +++ b/docker/development/php-fpm/Dockerfile @@ -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 \ diff --git a/docker/production/nginx/Dockerfile b/docker/production/nginx/Dockerfile index e201cd15..eebda469 100644 --- a/docker/production/nginx/Dockerfile +++ b/docker/production/nginx/Dockerfile @@ -1,4 +1,4 @@ -FROM node:21-alpine as builder +FROM node:22-alpine as builder WORKDIR /app @@ -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 diff --git a/docker/production/php-fpm/Dockerfile b/docker/production/php-fpm/Dockerfile index 46c6fffd..9c15db8b 100644 --- a/docker/production/php-fpm/Dockerfile +++ b/docker/production/php-fpm/Dockerfile @@ -1,4 +1,4 @@ -FROM node:21-alpine as builder +FROM node:22-alpine as builder WORKDIR /app