From 782042ada148a5cb07d508d03c27b60718834274 Mon Sep 17 00:00:00 2001 From: chmuche Date: Fri, 3 May 2024 17:29:36 +0200 Subject: [PATCH 1/3] feat: Add `jq` from official `jq` docker container --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7dd4e44..008e572 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ VOLUME ["/actions"] WORKDIR /actions COPY --from=build /tmp/fakeroot/ / - +COPY --from=ghcr.io/jqlang/jq /jq /usr/bin/jq ## The loader search ld-linux-x86-64.so.2 in /lib64 but the folder does not exist RUN ln -s lib lib64 From 11b32ee43a106becf54dd142a4dbb4e16bbd2546 Mon Sep 17 00:00:00 2001 From: Alexis PASQUIER Date: Fri, 3 May 2024 19:21:02 +0200 Subject: [PATCH 2/3] perf: REmove useless layer --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 008e572..df09daf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,5 @@ WORKDIR /actions COPY --from=build /tmp/fakeroot/ / COPY --from=ghcr.io/jqlang/jq /jq /usr/bin/jq -## The loader search ld-linux-x86-64.so.2 in /lib64 but the folder does not exist -RUN ln -s lib lib64 ENTRYPOINT ["clever"] From 081aca2bf88693dd5944c80886458bf3f4623b20 Mon Sep 17 00:00:00 2001 From: Alexis PASQUIER Date: Fri, 3 May 2024 19:23:12 +0200 Subject: [PATCH 3/3] fix: CleverCloud/clever-tools-dockerhub#5 Add curl binary : - missing in busybox:glibc . Add cert to avoid `curl: (77) error setting certificate file: /etc/ssl/certs/ca-certificates.crt` --- Dockerfile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index df09daf..3377051 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,9 @@ RUN \ cp $(ldd /usr/local/bin/clever | grep -o '/.\+\.so[^ ]*' | sort | uniq) /tmp/fakeroot/lib && \ for lib in /tmp/fakeroot/lib/*; do strip --strip-all $lib; done && \ mkdir -p /tmp/fakeroot/bin/ && \ - cp /usr/local/bin/clever /tmp/fakeroot/bin/ + cp /usr/local/bin/clever /tmp/fakeroot/bin/ && \ + mkdir -p /tmp/fakeroot/certs/ && \ + cp /etc/ssl/certs/ca-certificates.crt /tmp/fakeroot/certs/ca-certificates.crt FROM busybox:glibc AS release @@ -29,6 +31,13 @@ VOLUME ["/actions"] WORKDIR /actions COPY --from=build /tmp/fakeroot/ / +COPY --from=ghcr.io/tarampampam/curl:8.6.0 /bin/curl /usr/bin/curl COPY --from=ghcr.io/jqlang/jq /jq /usr/bin/jq + +## The loader search ld-linux-x86-64.so.2 in /lib64 but the folder does not exist +RUN \ + mkdir -p /etc/ssl/certs && \ + ln /certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt + ENTRYPOINT ["clever"]