From eff9e8d0487999090de016c94fd917ff8c0f72a5 Mon Sep 17 00:00:00 2001 From: Alex Palaistras Date: Wed, 3 Jan 2024 16:49:24 +0000 Subject: [PATCH] Fix nits for Grafana, LetsEncrypt containers --- service/grafana/Containerfile | 7 ++++--- service/letsencrypt/Containerfile | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/service/grafana/Containerfile b/service/grafana/Containerfile index aa33514..53f5c2f 100644 --- a/service/grafana/Containerfile +++ b/service/grafana/Containerfile @@ -1,11 +1,12 @@ FROM docker.io/debian:bookworm-slim@sha256:f80c45482c8d147da87613cb6878a7238b8642bcc24fc11bad78c7bec726f340 AS builder ARG VERSION=10.2.3 # renovate: datasource=github-releases depName=grafana/grafana extractVersion=^v(?.*)$ + WORKDIR /src ADD https://dl.grafana.com/oss/release/grafana-${VERSION}.linux-amd64.tar.gz /src.tar.gz -RUN tar --no-same-owner -xvzf /src.tar.gz && \ - install -D --mode 0755 /src/grafana-v${VERSION}/bin/grafana /build/usr/bin/grafana && \ - mkdir -p /build/usr/share/grafana && cp -R /src/grafana-v${VERSION}/public /build/usr/share/grafana/public +RUN tar --no-same-owner --strip-components 1 -xvzf /src.tar.gz && \ + install -D --mode 0755 /src/bin/grafana /build/usr/bin/grafana && \ + mkdir -p /build/usr/share/grafana && cp -R /src/public /build/usr/share/grafana/public FROM docker.io/debian:bookworm-slim@sha256:f80c45482c8d147da87613cb6878a7238b8642bcc24fc11bad78c7bec726f340 RUN apt-get update -y && apt-get upgrade -y && apt-get install -y --no-install-recommends \ diff --git a/service/letsencrypt/Containerfile b/service/letsencrypt/Containerfile index 1bf5ace..638116c 100644 --- a/service/letsencrypt/Containerfile +++ b/service/letsencrypt/Containerfile @@ -1,7 +1,6 @@ FROM docker.io/golang:1.21-bookworm@sha256:1415bb0b25d3bffc0a44dcf9851c20a9f8bbe558095221d931f2e4a4cc3596eb AS builder ARG VERSION=v4.14.2 # renovate: datasource=github-releases depName=go-acme/lego -WORKDIR /build RUN GOBIN=/build/usr/bin go install -v github.com/go-acme/lego/v4/cmd/lego@${VERSION} FROM docker.io/debian:bookworm-slim@sha256:f80c45482c8d147da87613cb6878a7238b8642bcc24fc11bad78c7bec726f340