From 2fb9834c8a6501088d9aa1fbe62a6149196c32f9 Mon Sep 17 00:00:00 2001 From: Jesus Date: Thu, 3 Oct 2024 03:36:00 +0000 Subject: [PATCH] fix dockerfile --- src/Dockerfile | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/src/Dockerfile b/src/Dockerfile index 46ec4f5..81d6099 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -5,17 +5,24 @@ FROM docker.io/golang:1-bookworm AS build WORKDIR /go/src/github.com/adnanh/webhook ENV WEBHOOK_VERSION 2.8.1 -RUN apk add --update -t build-deps curl libc-dev gcc libgcc +#RUN apk add --update -t build-deps curl libc-dev gcc libgcc +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends curl RUN curl -L --silent -o webhook.tar.gz https://github.com/adnanh/webhook/archive/${WEBHOOK_VERSION}.tar.gz && \ tar -xzf webhook.tar.gz --strip 1 && \ go get -d && \ go build -o /usr/local/bin/webhook && \ - apk del --purge build-deps && \ - rm -rf /var/cache/apk/* && \ + #apk del --purge build-deps && \ + apt-get purge -y build-deps && \ + #rm -rf /var/cache/apk/* && \ + apt-get remove -y --auto-remove \ + ; \ + rm -rf /var/lib/apt/lists/*; \ rm -rf /go #FROM docker.io/alpine:edge -FROM docker.io/rust::bookworm +FROM docker.io/rust:bookworm ENV RESTIC_VERSION=0.17.1 ENV RESTIC_ARCH=linux_amd64 @@ -39,23 +46,26 @@ RUN set -eux; \ git \ bzip2 \ sed \ - nushell \ - openssh \ +# openssh \ openssl \ - libressl \ +# libressl \ curl \ jq \ - zlib \ + zlib1g \ gnupg \ wget \ - python3; \ - update-ca-certificates; \ - python3 -m ensurepip; \ - rm -r /usr/lib/python*/ensurepip; \ - pip3 install jinja2 s3cmd ; \ +# python3 \ + python3-pip \ + python3-jinja2 \ +# python3-s3cmd \ + pipx; \ + update-ca-certificates; \ +# python3 -m ensurepip; \ +# rm -r /usr/lib/python*/ensurepip; \ +# pip install jinja2 s3cmd ; \ curl -fSL "https://dl.k8s.io/v${K8S_VERSION}/kubernetes-client-${K8S_ARCH}.tar.gz" -o /tmp/kubernetes-client-${K8S_ARCH}.tar.gz; \ tar -C /tmp -xvzf /tmp/kubernetes-client-${K8S_ARCH}.tar.gz ;\ - if [ -f /tmp/kubernetes/client/bin/kubectl ]; then mv /tmp/kubernetes/client/bin /usr/local/bin; fi ;\ + if [ -f /tmp/kubernetes/client/bin/kubectl ]; then mv /tmp/kubernetes/client/bin/kubectl /usr/local/bin; fi ;\ rm -rf /tmp/kubernetes*; \ chmod +x /usr/local/bin/kubectl; \ curl -fSL "https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/yq_${YQ_ARCH}" -o /usr/local/bin/yq; \