From fed49ac659efd0bf4539495d7feb2930055a5ade Mon Sep 17 00:00:00 2001 From: Tobias Hargesheimer Date: Sat, 18 Jan 2025 22:21:12 +0100 Subject: [PATCH] Update --- .github/workflows/build_docker_images-static-curl.yaml | 9 --------- static-curl.scratch.Dockerfile | 10 +++++++--- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build_docker_images-static-curl.yaml b/.github/workflows/build_docker_images-static-curl.yaml index add2edf..5497a97 100644 --- a/.github/workflows/build_docker_images-static-curl.yaml +++ b/.github/workflows/build_docker_images-static-curl.yaml @@ -102,12 +102,3 @@ jobs: docker.io/${{steps.script.outputs.docker_repo}}:static-curl-${{steps.script.outputs.curl_version}} quay.io/${{steps.script.outputs.redhat_quay_repo}}:static-curl ${{steps.script.outputs.git_url}}/${{steps.script.outputs.git_repo}}:static-curl - - #- name: Docker Hub Description - # uses: peter-evans/dockerhub-description@v4 - # with: - # username: ${{ secrets.DOCKER_USERNAME }} - # password: ${{ secrets.DOCKER_PASSWORD }} - # repository: ${{steps.script.outputs.docker_repo}} - # short-description: ${{ github.event.repository.description }} - # readme-filepath: README.md \ No newline at end of file diff --git a/static-curl.scratch.Dockerfile b/static-curl.scratch.Dockerfile index cdb3da1..db40867 100644 --- a/static-curl.scratch.Dockerfile +++ b/static-curl.scratch.Dockerfile @@ -1,14 +1,18 @@ -# build: docker build --no-cache --progress=plain --build-arg CURL_VERSION=8.11.0 -t tobi312/tools:static-curl -f static-curl.scratch.Dockerfile . +# build: docker build --no-cache --progress=plain --build-arg CURL_VERSION=8.11.1 -t tobi312/tools:static-curl -f static-curl.scratch.Dockerfile . +# hadolint ignore=DL3007 FROM alpine:latest AS static-curl # curl: https://github.com/stunnel/static-curl # (Alternatives: https://github.com/tarampampam/curl-docker , https://github.com/moparisthebest/static-curl or https://github.com/perryflynn/static-binaries) +SHELL ["/bin/ash", "-euxo", "pipefail", "-c"] + ARG CURL_VERSION ARG CURL_LIBC="musl" +# hadolint ignore=DL3018,SC2086 RUN \ - set -ex ; \ + #set -ex ; \ apk add --no-cache \ ca-certificates \ #curl \ @@ -45,7 +49,7 @@ RUN \ wget -qO- https://github.com/stunnel/static-curl/releases/download/${CURL_VERSION}/curl-linux-${TARGETARCH}-${CURL_LIBC}-${CURL_VERSION}.tar.xz | tar -xJ -C /usr/local/bin/ curl ; \ /usr/local/bin/curl --version -FROM scratch +FROM scratch AS production ARG CURL_VERSION ARG VCS_REF