Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update all non-major docker images #1460

Merged
merged 1 commit into from
Oct 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM node:16-alpine@sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 AS node

FROM wordpress:cli-php8.1@sha256:ad4f75f54a2fe484b5c1b12ddb2a9addad0f07ef182bd00afaf5c386f527fd63
FROM wordpress:cli-php8.1@sha256:50b2657d9f5afac81a8167182dcb60c77d8dcff01afd81ca82e3eefe769691d1

COPY --from=node /usr/lib /usr/lib
COPY --from=node /usr/local/share /usr/local/share
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3'

services:
db:
image: mariadb:10.11.5@sha256:3e8f15fd6328340f4024fcb7005cce0da1fa5065554b7c420626f803b67ddc12
image: mariadb:10.11.5@sha256:16b181cf0cbca0bc8e5f8ef3695a82c7bd9ba36cc4fc587f4b357c558faeeccd
container_name: db
restart: unless-stopped
logging:
Expand All @@ -25,7 +25,7 @@ services:

apache:
container_name: apache
image: httpd:2.4-alpine@sha256:73ec2cd346c901b0632280a0e6c550b238dbc69ebd76a43566caeecb6b73a2b8
image: httpd:2.4-alpine@sha256:02a928bf7db1a0baeebb01cb24c25237a111bbf2c43d5fa42eda6b41568dff41
logging:
driver: none
ports:
Expand Down Expand Up @@ -90,7 +90,7 @@ services:

composer:
restart: 'no'
image: composer/composer:latest@sha256:d40c034be4ae3a39ab60006e1da01d82212a8efb032d2b49892fbe6aaa57c350
image: composer/composer:latest@sha256:e2c1f8e6674ec691a861b98c5bc5fad7e22cc3c010d9a506a0b9fada2a2d1dee
env_file: .env
command: >
/bin/bash -c '
Expand All @@ -108,7 +108,7 @@ services:
depends_on:
- db
- wordpress
image: wordpress:cli-php8.1@sha256:ad4f75f54a2fe484b5c1b12ddb2a9addad0f07ef182bd00afaf5c386f527fd63
image: wordpress:cli-php8.1@sha256:50b2657d9f5afac81a8167182dcb60c77d8dcff01afd81ca82e3eefe769691d1
profiles:
- tools
env_file: .env
Expand Down
4 changes: 2 additions & 2 deletions wordpress/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## Install composer dependencies
FROM composer:latest@sha256:1ac7a547cb88acb0de62663b70f2b3d80ad27355288245159404b6ae40cd9ca3 AS composer
FROM composer:latest@sha256:fd0b4f28a5070d4361d5cbfe7f7807a10bf2efe9396e42009f9e63f7fa307e38 AS composer

ARG WPML_USER_ID
ARG WPML_KEY
Expand Down Expand Up @@ -28,7 +28,7 @@ RUN npm --unsafe-perm install
# when updating the Wordpress version, update the version in the files:
# - ~/wordpress/docker/local.Dockerfile
# - ~/github/workflows/ci.yml
FROM wordpress:6.3.1-php8.1-fpm-alpine@sha256:02a1a52a067fa416311d3093069b4f2184ec01b37c2399d40e58864c30ffd276
FROM wordpress:6.3.1-php8.1-fpm-alpine@sha256:8f227c350b78a556c0e1080ed4fe3505a1d6418538faf4374e478c92143147a9

RUN apk add --no-cache $PHPIZE_DEPS \
&& pecl install pcov \
Expand Down
2 changes: 1 addition & 1 deletion wordpress/docker/apache/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM httpd:2.4.57-alpine@sha256:73ec2cd346c901b0632280a0e6c550b238dbc69ebd76a43566caeecb6b73a2b8
FROM httpd:2.4.57-alpine@sha256:02a928bf7db1a0baeebb01cb24c25237a111bbf2c43d5fa42eda6b41568dff41

WORKDIR /usr/src/wordpress

Expand Down
2 changes: 1 addition & 1 deletion wordpress/docker/local.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# wordpress version needs to match the version found in ~/wordpress/docker/Dockerfile
FROM wordpress:6.3.1-php8.1-fpm-alpine@sha256:02a1a52a067fa416311d3093069b4f2184ec01b37c2399d40e58864c30ffd276
FROM wordpress:6.3.1-php8.1-fpm-alpine@sha256:8f227c350b78a556c0e1080ed4fe3505a1d6418538faf4374e478c92143147a9

WORKDIR /usr/src/wordpress

Expand Down