diff --git a/roles/apps/tasks/caddy.yml b/roles/apps/tasks/caddy.yml index 1d0df7f..01c03cc 100644 --- a/roles/apps/tasks/caddy.yml +++ b/roles/apps/tasks/caddy.yml @@ -1,30 +1,30 @@ -- name: Create containers/caddy dir +- name: caddy - Create containers/caddy dir ansible.builtin.file: path: ~/containers/caddy state: directory -- name: Create ~/vol/caddy dir +- name: caddy - Create ~/vol/caddy dir ansible.builtin.file: path: ~/vol/caddy state: directory -- name: Copy Containerfile +- name: caddy - Copy Containerfile ansible.builtin.template: src: caddy/Containerfile.j2 dest: ~/containers/caddy/Containerfile -- name: Copy caddy-node.container +- name: caddy - Copy caddy-node.container ansible.builtin.template: src: caddy/caddy-node.container.j2 dest: ~/containers/caddy/caddy-node.container -- name: Copy build.sh +- name: caddy - Copy build.sh ansible.builtin.template: src: caddy/build.sh.j2 dest: ~/containers/caddy/build.sh mode: "0700" -- name: Link caddy-node to .config/containers/systemd +- name: caddy - Link caddy-node to .config/containers/systemd ansible.builtin.file: src: ~/conttainers/caddy/caddy-node.container dest: ~/.config/containers/systemd/caddy-node.container diff --git a/roles/apps/templates/caddy/Containerfile.j2 b/roles/apps/templates/caddy/Containerfile.j2 index e0f5a87..d8eddc2 100644 --- a/roles/apps/templates/caddy/Containerfile.j2 +++ b/roles/apps/templates/caddy/Containerfile.j2 @@ -16,4 +16,4 @@ RUN microdnf update -y \ EXPOSE 8080 8443 -ENTRYPOINT ["/app/caddy run --config /app/data/caddy.json"] +CMD ["/app/caddy", "run", "--config", "/app/data/caddy.json"]