From 902d08ca40ff982c70bab37e4987f41a5db3bb99 Mon Sep 17 00:00:00 2001 From: Matti Ranta Date: Tue, 13 Nov 2018 19:45:30 -0500 Subject: [PATCH 1/2] use s3browser caddy image --- ansible/roles/downloads/defaults/main.yml | 2 +- ansible/roles/downloads/templates/compose.j2 | 17 +++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/ansible/roles/downloads/defaults/main.yml b/ansible/roles/downloads/defaults/main.yml index a3d5660..4b1bc16 100644 --- a/ansible/roles/downloads/defaults/main.yml +++ b/ansible/roles/downloads/defaults/main.yml @@ -1,4 +1,4 @@ -downloads_container: webhippie/caddy:latest +downloads_container: techknowlogick/caddy-s3browser:latest downloads_domain: dl.gitea.io minio_container: webhippie/minio:latest diff --git a/ansible/roles/downloads/templates/compose.j2 b/ansible/roles/downloads/templates/compose.j2 index 8b7e772..30bd0fb 100644 --- a/ansible/roles/downloads/templates/compose.j2 +++ b/ansible/roles/downloads/templates/compose.j2 @@ -14,21 +14,18 @@ services: image: ${DOWNLOADS_CONTAINER} restart: always environment: - - CADDY_WEBROOT=/var/lib/minio/releases + - S3_KEY=${MINIO_ACCESS} + - S3_SECRET=${MINIO_SECRET} + - S3_BUCKET=releases + - S3_ENDPOINT=storage.gitea.io + - S3_PROTO=https + - S3_HOST=storage.gitea.io networks: - traefik labels: - traefik.docker.network=traefik_general - - traefik.port=8080 + - traefik.port=80 - traefik.frontend.rule=Host:${DOWNLOADS_DOMAIN} - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/"] - interval: 30s - timeout: 10s - retries: 5 - volumes: - - /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt:ro - - server:/var/lib/minio minio: image: ${MINIO_CONTAINER} From 78073ba01155f81faa71d37e7ce835a8b1ba09b5 Mon Sep 17 00:00:00 2001 From: Matti Ranta Date: Wed, 14 Nov 2018 14:47:40 -0500 Subject: [PATCH 2/2] add healthcheck back into compose --- ansible/roles/downloads/templates/compose.j2 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ansible/roles/downloads/templates/compose.j2 b/ansible/roles/downloads/templates/compose.j2 index 30bd0fb..7d72924 100644 --- a/ansible/roles/downloads/templates/compose.j2 +++ b/ansible/roles/downloads/templates/compose.j2 @@ -20,12 +20,20 @@ services: - S3_ENDPOINT=storage.gitea.io - S3_PROTO=https - S3_HOST=storage.gitea.io + - S3_EXTRA=/releases/ networks: - traefik labels: - traefik.docker.network=traefik_general - traefik.port=80 - traefik.frontend.rule=Host:${DOWNLOADS_DOMAIN} + healthcheck: + test: ["CMD", "wget", "-O", "-", "http://localhost/"] + interval: 30s + timeout: 10s + retries: 5 + volumes: + - /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt:ro minio: image: ${MINIO_CONTAINER}