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

Bump alpine to 3.20 #1621

Merged
merged 3 commits into from
Aug 9, 2024
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 src/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG FTL_SOURCE=remote
ARG alpine_version="3.19"
ARG alpine_version="3.20"
FROM alpine:${alpine_version} AS base
# https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope

Expand Down
11 changes: 6 additions & 5 deletions test/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG alpine_version="3.19"
ARG docker_version="25.0.4"
ARG alpine_version="3.20"
ARG docker_version="27.1.1"

FROM docker:${docker_version}-cli-alpine${alpine_version}

Expand All @@ -13,9 +13,10 @@ RUN apk add --no-cache \
curl \
&& pip3 install --break-system-packages --no-cache-dir -U pip \
&& pip3 install --break-system-packages --no-cache-dir -r requirements.txt \
# Not 100% sure what this line does, but it's always been in the Dockerfile (aside from pointing at a different file)
# Tests fall over without it. Investigate later.
&& sed -i 's|/bin/sh|/bin/bash|g' /usr/lib/python3.11/site-packages/testinfra/backend/docker.py
# Replace hardcoded /bin/sh with /bin/bash in testinfra docker backend
# see https://github.com/pytest-dev/pytest-testinfra/issues/582 and similar issues
&& pythonversion=$(python3 -c 'import sys; print(".".join(map(str, sys.version_info[:2])))') \
&& sed -i 's|/bin/sh|/bin/bash|g' /usr/lib/python${pythonversion}/site-packages/testinfra/backend/docker.py

SHELL ["/bin/sh", "-c"]
CMD ["cmd.sh"]