Skip to content

Commit

Permalink
Merge pull request #1871 from data-team-uhn/misc-alpine-upgrade
Browse files Browse the repository at this point in the history
[misc] Upgrade the version of alpine linux used for our docker images
  • Loading branch information
sdumitriu authored Jan 8, 2025
2 parents 64e294e + e3f8d76 commit 66de81d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion compose-cluster/cleanup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ rm -r secrets

# Due permissions issues, we have to first remove all contents of SLING with Docker
echo "Removing SLING"
docker run --rm -v $(realpath ./SLING):/sling -it alpine:3.17 sh -c 'cd /sling; find . -delete'
docker run --rm -v $(realpath ./SLING):/sling -it alpine:3.21 sh -c 'cd /sling; find . -delete'
rm -rf SLING

echo "Removing CARDS_LOGS"
Expand Down
2 changes: 1 addition & 1 deletion compose-cluster/percona_encryption_at_rest.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ Tests
by mounting it to an Alpine Linux container and exploring it as `UID=1001`.

```bash
docker run --rm -u 1001 -v $(realpath PERCONA_DATA):/data:ro -it alpine:3.17
docker run --rm -u 1001 -v $(realpath PERCONA_DATA):/data:ro -it alpine:3.21

cd /data

Expand Down
4 changes: 2 additions & 2 deletions distribution/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# JARs

# Build Image
FROM alpine:3.17
FROM alpine:3.21

ARG build_jars

Expand All @@ -42,7 +42,7 @@ RUN mkdir /metadata
RUN if [[ "$build_jars" == "true" ]] ; then cp /cards/aggregated-frontend/src/main/frontend/yarn.lock /metadata/yarn.lock ; fi

# Production Image: Start from a small Alpine Linux base image
FROM alpine:3.17
FROM alpine:3.21

# Install dependency Alpine Linux packages and apply any available package upgrades
RUN apk update
Expand Down

0 comments on commit 66de81d

Please sign in to comment.