From 97ea17b8db047e533c134c8729d7aff700078f45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=AA=20de=20Souza=20Pinto?= Date: Tue, 16 Jul 2024 15:49:18 +0000 Subject: [PATCH] [WIP]: Bump Alpine version to 3.20 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These are potential packages that can be removed in favor of the versions already provided by Alpine. Signed-off-by: Renê de Souza Pinto --- pkg/apparmor/Dockerfile | 2 +- pkg/dnsmasq/Dockerfile | 2 +- pkg/fscrypt/Dockerfile | 4 ++-- pkg/guacd/Dockerfile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/apparmor/Dockerfile b/pkg/apparmor/Dockerfile index 55d80c4f29d..3f6bc605d55 100644 --- a/pkg/apparmor/Dockerfile +++ b/pkg/apparmor/Dockerfile @@ -3,7 +3,7 @@ # Copyright (c) 2023 Zededa, Inc. # SPDX-License-Identifier: Apache-2.0 -FROM lfedge/eve-alpine:1f7685f95a475c6bbe682f0b976f12180b6c8726 as build +FROM lfedge/eve-alpine:edfe4f996acdc860e36cc8a8c09ac0c2637e00ef as build ENV BUILD_PKGS linux-headers musl-dev musl-utils musl-libintl git gcc g++ \ autoconf automake libtool make flex bison bash sed gettext ENV PKGS alpine-baselayout diff --git a/pkg/dnsmasq/Dockerfile b/pkg/dnsmasq/Dockerfile index a059e2a5bc0..04c165a4ea4 100644 --- a/pkg/dnsmasq/Dockerfile +++ b/pkg/dnsmasq/Dockerfile @@ -1,4 +1,4 @@ -FROM lfedge/eve-alpine:1f7685f95a475c6bbe682f0b976f12180b6c8726 as build +FROM lfedge/eve-alpine:edfe4f996acdc860e36cc8a8c09ac0c2637e00ef as build ENV BUILD_PKGS gcc make patch libc-dev linux-headers tar RUN eve-alpine-deploy.sh diff --git a/pkg/fscrypt/Dockerfile b/pkg/fscrypt/Dockerfile index 4412a5b9e53..f2ff17c057c 100644 --- a/pkg/fscrypt/Dockerfile +++ b/pkg/fscrypt/Dockerfile @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 -FROM lfedge/eve-alpine:1f7685f95a475c6bbe682f0b976f12180b6c8726 AS build-base +FROM lfedge/eve-alpine:edfe4f996acdc860e36cc8a8c09ac0c2637e00ef AS build-base FROM build-base AS build-amd64 FROM build-base AS build-arm64 @@ -29,4 +29,4 @@ RUN set -e && for patch in *.patch; do \ RUN make -j "$(getconf _NPROCESSORS_ONLN)" && make DESTDIR="/out/opt/zededa" PREFIX="" install FROM scratch -COPY --from=build /out/opt/zededa/bin /opt/zededa/bin \ No newline at end of file +COPY --from=build /out/opt/zededa/bin /opt/zededa/bin diff --git a/pkg/guacd/Dockerfile b/pkg/guacd/Dockerfile index acb8b0b5452..bf6b3efa70a 100644 --- a/pkg/guacd/Dockerfile +++ b/pkg/guacd/Dockerfile @@ -1,6 +1,6 @@ # Copyright (c) 2023 Zededa, Inc. # SPDX-License-Identifier: Apache-2.0 -FROM lfedge/eve-alpine:1f7685f95a475c6bbe682f0b976f12180b6c8726 as build +FROM lfedge/eve-alpine:edfe4f996acdc860e36cc8a8c09ac0c2637e00ef as build ENV BUILD_PKGS cairo-dev jpeg-dev libpng-dev gcc make libc-dev openssl-dev libvncserver-dev file patch ENV PKGS alpine-baselayout musl-utils libtasn1-progs p11-kit cairo jpeg libpng libvncserver RUN eve-alpine-deploy.sh