Skip to content

Commit

Permalink
[WIP]: Bump Alpine version to 3.20
Browse files Browse the repository at this point in the history
These are potential packages that can be removed in favor of the
versions already provided by Alpine.

Signed-off-by: Renê de Souza Pinto <[email protected]>
  • Loading branch information
rene committed Jul 16, 2024
1 parent 64c9149 commit 97ea17b
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion pkg/apparmor/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/dnsmasq/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions pkg/fscrypt/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
COPY --from=build /out/opt/zededa/bin /opt/zededa/bin
2 changes: 1 addition & 1 deletion pkg/guacd/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 97ea17b

Please sign in to comment.