Pi-Hole/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2025-12-20 02:18:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1621 from pi-hole/update-alpine

Browse Source 
Bump alpine to 3.20
This commit is contained in:
Adam Warner
2024-08-09 14:50:16 +01:00
committed by GitHub
parent a3633a1732 953cee4019
commit 1c7d276aa2
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Dockerfile
View File

@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG FTL_SOURCE=remote ARG FTL_SOURCE=remote
ARG alpine_version="3.19" ARG alpine_version="3.20"
FROM alpine:${alpine_version} AS base FROM alpine:${alpine_version} AS base
# https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope # https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope

11
test/Dockerfile
View File

@@ -1,5 +1,5 @@
ARG alpine_version="3.19" ARG alpine_version="3.20"
ARG docker_version="25.0.4" ARG docker_version="27.1.1"
FROM docker:${docker_version}-cli-alpine${alpine_version} FROM docker:${docker_version}-cli-alpine${alpine_version}
@@ -13,9 +13,10 @@ RUN apk add --no-cache \
curl \ curl \
&& pip3 install --break-system-packages --no-cache-dir -U pip \ && pip3 install --break-system-packages --no-cache-dir -U pip \
&& pip3 install --break-system-packages --no-cache-dir -r requirements.txt \ && 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) # Replace hardcoded /bin/sh with /bin/bash in testinfra docker backend
# Tests fall over without it. Investigate later. # see https://github.com/pytest-dev/pytest-testinfra/issues/582 and similar issues
&& sed -i 's|/bin/sh|/bin/bash|g' /usr/lib/python3.11/site-packages/testinfra/backend/docker.py && 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"] SHELL ["/bin/sh", "-c"]
CMD ["cmd.sh"] CMD ["cmd.sh"]