Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use alpine 3.21 for Dockerfile #3503

Merged
merged 1 commit into from
Dec 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ jobs:
path: |
./**/*.log

test-docker-x64-packages:
test-dockerfile-x64:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
Expand Down
10 changes: 7 additions & 3 deletions contrib/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=$TARGETPLATFORM alpine:3.17 AS builder
FROM alpine:3.21 AS builder
ARG TARGETPLATFORM
WORKDIR /tmp/hurl-docker
COPY . /tmp/hurl-docker
Expand All @@ -11,7 +11,7 @@ RUN apk add --no-cache bash git && \
bash -c "bin/install_rust.sh" && \
bash -c "./bin/release/release.sh"

FROM --platform=$TARGETPLATFORM alpine:3.17 AS runner
FROM alpine:3.21 AS runner
ARG docker_build_date
ARG docker_build_tag
LABEL "org.opencontainers.image.source"="https://github.com/Orange-OpenSource/hurl"
Expand All @@ -27,10 +27,14 @@ LABEL "com.orange.hurl.vendor"="Orange-OpenSource"
LABEL "com.orange.hurl.licenses"="Apache-2.0"
LABEL "com.orange.hurl.title"="Hurl"
LABEL "com.orange.hurl.description"="Hurl is a command line tool that runs HTTP requests defined in a simple plain text format"
LABEL "com.orange.hurl.base.name"="alpine:3.17"
LABEL "com.orange.hurl.base.name"="alpine:3.21"
COPY --from=builder /tmp/hurl-docker/target/release/hurl /usr/bin/
COPY --from=builder /tmp/hurl-docker/target/release/hurlfmt /usr/bin/
COPY --from=builder /usr/lib/libcurl.so.* /usr/lib/
COPY --from=builder /usr/lib/libcares.so.* /usr/lib/
COPY --from=builder /usr/lib/libpsl.so.* /usr/lib/
COPY --from=builder /usr/lib/libzstd.so.* /usr/lib/
COPY --from=builder /usr/lib/libunistring.so.* /usr/lib/
COPY --from=builder /usr/lib/libnghttp2.so.* /usr/lib/
COPY --from=builder /usr/lib/libbrotli*.so.* /usr/lib/
COPY --from=builder /usr/lib/libxml2.so.* /usr/lib/
Expand Down
Loading