diff --git a/roles/apps/tasks/caddy.yml b/roles/apps/tasks/caddy.yml index 93816dd..1d0df7f 100644 --- a/roles/apps/tasks/caddy.yml +++ b/roles/apps/tasks/caddy.yml @@ -22,6 +22,7 @@ ansible.builtin.template: src: caddy/build.sh.j2 dest: ~/containers/caddy/build.sh + mode: "0700" - name: Link caddy-node to .config/containers/systemd ansible.builtin.file: diff --git a/roles/apps/templates/caddy/Containerfile.j2 b/roles/apps/templates/caddy/Containerfile.j2 index d436b9b..e0f5a87 100644 --- a/roles/apps/templates/caddy/Containerfile.j2 +++ b/roles/apps/templates/caddy/Containerfile.j2 @@ -4,16 +4,15 @@ ARG VERSION={{caddy_version}} WORKDIR /app -RUN dnf update -y \ - && dnf install -y wget tar gzip \ +RUN microdnf update -y \ + && microdnf install -y wget tar gzip \ && wget https://github.com/caddyserver/caddy/releases/download/v2.7.6/caddy_${VERSION}_linux_amd64.tar.gz \ && wget https://github.com/caddyserver/caddy/releases/download/v2.7.6/caddy_${VERSION}_checksums.txt \ && sha512sum --ignore-missing --check caddy_${VERSION}_checksums.txt \ && tar xf caddy_${VERSION}_linux_amd64.tar.gz \ && rm -f caddy_${VERSION}_linux.amd64.tar.gz LICENSE README.md caddy_${VERSION}_checksums.txt \ - && rm -rf /var/cache/* /var/log* /tmp/* - -RUN chmod +x ./caddy + && rm -rf /var/cache/* /var/log* /tmp/* \ + && chmod +x ./caddy EXPOSE 8080 8443