diff --git a/images/acme-to-vault/Dockerfile b/images/acme-to-vault/Dockerfile index 6b09790..fe98fe8 100644 --- a/images/acme-to-vault/Dockerfile +++ b/images/acme-to-vault/Dockerfile @@ -1,4 +1,4 @@ -FROM danielberteaud/alpine:latest +FROM [[ .docker.repo ]][[ .docker.base_images.alpine ]] MAINTAINER Daniel Berteaud ENV ACME_HTTP_PORT=8787 \ @@ -19,7 +19,7 @@ RUN set -eu &&\ chown acme:acme /secrets &&\ setcap -r /usr/sbin/vault -COPY resources/ / +COPY root/ / USER acme EXPOSE ${ACME_HTTP_PORT} diff --git a/images/acme-to-vault/resources/entrypoint.d/restore-state.sh b/images/acme-to-vault/root/entrypoint.d/restore-state.sh similarity index 100% rename from images/acme-to-vault/resources/entrypoint.d/restore-state.sh rename to images/acme-to-vault/root/entrypoint.d/restore-state.sh diff --git a/images/acme-to-vault/resources/usr/local/bin/acme-to-vault.sh b/images/acme-to-vault/root/usr/local/bin/acme-to-vault.sh similarity index 100% rename from images/acme-to-vault/resources/usr/local/bin/acme-to-vault.sh rename to images/acme-to-vault/root/usr/local/bin/acme-to-vault.sh diff --git a/images/acme-to-vault/resources/usr/local/bin/upload-to-vault.sh b/images/acme-to-vault/root/usr/local/bin/upload-to-vault.sh similarity index 100% rename from images/acme-to-vault/resources/usr/local/bin/upload-to-vault.sh rename to images/acme-to-vault/root/usr/local/bin/upload-to-vault.sh diff --git a/variables.yml b/variables.yml index af12fb2..f59fbad 100644 --- a/variables.yml +++ b/variables.yml @@ -2,7 +2,7 @@ acme: # The Docker image to use - image: danielberteaud/acme-to-vault:20230821-2 + image: danielberteaud/acme-to-vault:20230828-1 # If a cron expression is defined, the service will stay running and renew certs. # If an empty string, the container will exit after running once