From aade6999ada8a867dc77a96bf76f312099aa973d Mon Sep 17 00:00:00 2001 From: Jacob <62761393+Jacrac04@users.noreply.github.com> Date: Thu, 30 Jan 2025 14:31:18 +0000 Subject: [PATCH 1/6] Mv compose to dev-compose --- docker/{compose.yaml => dev-compose.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docker/{compose.yaml => dev-compose.yaml} (100%) diff --git a/docker/compose.yaml b/docker/dev-compose.yaml similarity index 100% rename from docker/compose.yaml rename to docker/dev-compose.yaml From 30e4ab334db0e33db7d5d97e0b9897d6be8866ba Mon Sep 17 00:00:00 2001 From: Jacob <62761393+Jacrac04@users.noreply.github.com> Date: Thu, 30 Jan 2025 14:31:39 +0000 Subject: [PATCH 2/6] Update dev-compose --- docker/dev-compose.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/dev-compose.yaml b/docker/dev-compose.yaml index df50001..2cbe95b 100644 --- a/docker/dev-compose.yaml +++ b/docker/dev-compose.yaml @@ -1,4 +1,3 @@ -version: '3' services: app: build: From 2dd4ef5fde643dea427c5ab433a75b9b4908749c Mon Sep 17 00:00:00 2001 From: Jacob <62761393+Jacrac04@users.noreply.github.com> Date: Thu, 30 Jan 2025 14:32:08 +0000 Subject: [PATCH 3/6] Add prod-compose --- docker/prod-compose.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 docker/prod-compose.yaml diff --git a/docker/prod-compose.yaml b/docker/prod-compose.yaml new file mode 100644 index 0000000..294b3bb --- /dev/null +++ b/docker/prod-compose.yaml @@ -0,0 +1,18 @@ +services: + app: + build: + context: ../ + dockerfile: docker/Dockerfile + labels: + - "traefik.enable=true" + - "traefik.http.routers..rule=Host(`.sucss.org`)" + - "traefik.http.routers..tls=true" + - "traefik.http.routers..middlewares=authentik@file" + - "traefik.http.services..loadbalancer.server.port=8000" + + networks: + - traefik + +networks: + traefik: + external: true \ No newline at end of file From 8462e71271253ec293c0b8ef440faf515fb9214f Mon Sep 17 00:00:00 2001 From: Jacob <62761393+Jacrac04@users.noreply.github.com> Date: Thu, 30 Jan 2025 14:32:34 +0000 Subject: [PATCH 4/6] Update README --- README.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 50fe859..36e9b71 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,11 @@ python -m poetry run gunicorn 'challenge:app' ``` ## Running with docker - +Run on local machine: +``` +docker-compose -p "" -f "docker/dev-compose.yaml" up --build ``` -docker-compose -p "" -f "docker/compose.yaml" up --build -``` \ No newline at end of file + +So it can be run on sucss server: +- Edit `docker/prod-compose.yaml` and change all occurrences of `` to the subdomain of the challenge. +For example if you want the challenge to be hosted on `challenge.sucss.org` then replace `` with `challenge`. From 14a47cdd788c718519a62f6b16821c1d7497d3da Mon Sep 17 00:00:00 2001 From: Jacob <62761393+Jacrac04@users.noreply.github.com> Date: Thu, 30 Jan 2025 16:40:35 +0000 Subject: [PATCH 5/6] Fix project? --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 9243665..6b4dd20 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] -name = "challenge-template" -version = "0.1.0" +name = "challenge_template" +version = "0.1.1" description = "SUCSS Challenge template" authors = ["Skyler Mansfield "] readme = "README.md" From ad35f7c6f1032c53f26649397fd7edc10fd37cdc Mon Sep 17 00:00:00 2001 From: Jacob <62761393+Jacrac04@users.noreply.github.com> Date: Thu, 30 Jan 2025 16:42:57 +0000 Subject: [PATCH 6/6] Fix Actions V2? --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 6b4dd20..63e1a64 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,9 +1,10 @@ [tool.poetry] -name = "challenge_template" +name = "challenge-template" version = "0.1.1" description = "SUCSS Challenge template" authors = ["Skyler Mansfield "] readme = "README.md" +package-mode = false [tool.poetry.scripts] dev = "challenge:main"