diff options
| author | Donatas Abraitis <donatas@opensourcerouting.org> | 2023-07-31 10:05:15 +0200 |
|---|---|---|
| committer | Donatas Abraitis <donatas@opensourcerouting.org> | 2023-07-31 10:05:15 +0200 |
| commit | 18becdc29e9898dc33806d072ed45c7ca9d45de2 (patch) | |
| tree | 40b76b29a8ef0b949aa83ac5e7874a82e31aae38 /docker | |
| parent | docker: Use openssl instead of libressl (diff) | |
| download | frr-18becdc29e9898dc33806d072ed45c7ca9d45de2.tar.xz frr-18becdc29e9898dc33806d072ed45c7ca9d45de2.zip | |
docker: Install the apk packages regardless of the platform
It was hardcoded to x86_64, but we build Alpine images for more platforms, let's
be dynamical here.
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/alpine/Dockerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile index d1c306006..98e840749 100644 --- a/docker/alpine/Dockerfile +++ b/docker/alpine/Dockerfile @@ -28,7 +28,7 @@ FROM alpine:3.18 as source-builder RUN mkdir -p /src/alpine /pkgs/apk COPY alpine/APKBUILD.in /src/alpine COPY --from=alpine-apk-builder-libyang /pkgs/apk/src /pkgs/apk -RUN cd /pkgs/apk/x86_64 && apk add --allow-untrusted *.apk +RUN cd /pkgs/apk && apk add --allow-untrusted */*.apk RUN source /src/alpine/APKBUILD.in \ && apk add \ --no-cache \ @@ -48,7 +48,7 @@ RUN cd /src \ FROM alpine-builder as alpine-apk-builder COPY --from=source-builder /src/frr-*.tar.gz /src/alpine/* /dist/ COPY --from=alpine-apk-builder-libyang /pkgs/apk/src /pkgs/apk -RUN cd /pkgs/apk/x86_64 && apk add --allow-untrusted *.apk +RUN cd /pkgs/apk && apk add --allow-untrusted */*.apk RUN find /pkgs/apk -type f -name APKINDEX.tar.gz -delete RUN chown -R builder /dist /pkgs USER builder |