Skip to content

Commit 1364486

Browse files
authored
fix: use pinned dependencies for docker base images (zalando#2306)
* fix: use pinned dependencies for docker container base images, which can be detected and updated by dependabot Signed-off-by: Sandor Szücs <[email protected]> * remove duplicate root level entries feature: keep docker base images up to date Signed-off-by: Sandor Szücs <[email protected]> --------- Signed-off-by: Sandor Szücs <[email protected]>
1 parent d85fb50 commit 1364486

File tree

7 files changed

+15
-14
lines changed

7 files changed

+15
-14
lines changed

.github/dependabot.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ updates:
99
directory: "/" # Location of package manifests
1010
schedule:
1111
interval: "weekly"
12-
13-
version: 2
14-
updates:
1512
- package-ecosystem: "github-actions"
1613
directory: "/" # Location of package manifests https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#directory
1714
schedule:
1815
interval: "weekly"
16+
- package-ecosystem: "docker" # Keep Docker dependencies up to date
17+
directory: "/"
18+
schedule:
19+
interval: "daily"

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
FROM registry.opensource.zalan.do/library/alpine-3:latest
2-
LABEL maintainer="Team Teapot @ Zalando SE <team-teapot@zalando.de>"
1+
FROM registry.opensource.zalan.do/library/alpine-3:latest@sha256:2924ef858efe1025d8f4094b1e3ee6f86db2d3e211052c06e0c8afb86643d46a
2+
LABEL maintainer="Team Gateway&Proxy @ Zalando SE <team-gwproxy@zalando.de>"
33

44
ADD skipper /usr/bin/
55

fastcgiserver/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:7.4.3-fpm-alpine3.11
1+
FROM php:7.4.3-fpm-alpine3.11@sha256:a748390f2d9f006a0bed261f751656ea49c8f040f664038fe7a47bab44f61212
22

33
RUN echo $'[www] \n\
44
user = www-data \n\
@@ -14,4 +14,4 @@ RUN mkdir -p /app/other/dir
1414
RUN echo "<?php echo 'Hello, World!';" > /app/index.php
1515
RUN echo "<?php echo 'Test1 #' . time();" > /app/test1.php
1616
RUN echo "<?php echo 'Test2 #' . time();" > /app/other/dir/test2.php
17-
WORKDIR /app
17+
WORKDIR /app

packaging/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
ARG BASE_IMAGE=registry.opensource.zalan.do/library/alpine-3:latest
1+
ARG BASE_IMAGE=registry.opensource.zalan.do/library/alpine-3:latest@sha256:2924ef858efe1025d8f4094b1e3ee6f86db2d3e211052c06e0c8afb86643d46a
22
FROM ${BASE_IMAGE}
3-
LABEL maintainer="Team Teapot @ Zalando SE <team-teapot@zalando.de>"
3+
LABEL maintainer="Team Gateway&Proxy @ Zalando SE <team-gwproxy@zalando.de>"
44
RUN apk --no-cache add ca-certificates && update-ca-certificates
55
RUN mkdir -p /usr/bin
66
ARG BUILD_FOLDER=build

packaging/Dockerfile.alpine

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:alpine
1+
FROM golang:alpine@sha256:913de96707b0460bcfdfe422796bb6e559fc300f6c53286777805a9a3010a5ea
22

33
ENV CGO_ENABLED 1
44
ENV GOOS linux

packaging/Dockerfile.arm64

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
FROM --platform=linux/arm64 alpine:3
2-
LABEL maintainer="Team Teapot @ Zalando SE <team-teapot@zalando.de>"
1+
FROM --platform=linux/arm64 alpine:3@sha256:124c7d2707904eea7431fffe91522a01e5a861a624ee31d03372cc1d138a3126
2+
LABEL maintainer="Team Gateway&Proxy @ Zalando SE <team-gwproxy@zalando.de>"
33
RUN apk --no-cache add ca-certificates && update-ca-certificates
44
ADD build/linux/arm64/skipper \
55
build/linux/arm64/eskip \

packaging/Dockerfile.armv7

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
FROM --platform=linux/arm/v7 alpine:3
2-
LABEL maintainer="Team Teapot @ Zalando SE <team-teapot@zalando.de>"
1+
FROM --platform=linux/arm/v7 alpine:3@sha256:124c7d2707904eea7431fffe91522a01e5a861a624ee31d03372cc1d138a3126
2+
LABEL maintainer="Team Gateway&Proxy @ Zalando SE <team-gwproxy@zalando.de>"
33
RUN apk --no-cache add ca-certificates && update-ca-certificates
44
ADD build/linux/arm/v7/skipper \
55
build/linux/arm/v7/eskip \

0 commit comments

Comments
 (0)