From 31b38e1d55cb0605ec0d6e889ae443b174f37993 Mon Sep 17 00:00:00 2001 From: Mark Calvert Date: Fri, 14 Jun 2024 12:08:17 +1200 Subject: [PATCH 1/4] Lagoonizing the project for Salsa hosting --- .lagoon.yml | 14 ++++++++++++++ Dockerfile | 2 +- docker-compose.yml | 5 +---- 3 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 .lagoon.yml diff --git a/.lagoon.yml b/.lagoon.yml new file mode 100644 index 00000000..4eb7cd52 --- /dev/null +++ b/.lagoon.yml @@ -0,0 +1,14 @@ +docker-compose-yaml: docker-compose.yml + +project: openfisca-aotearoa + +tasks: {} + +environments: + main: + routes: + - fisca-py: + - "rac.g0v.nz": + tls-acme: false + insecure: Redirect + hstsEnabled: true diff --git a/Dockerfile b/Dockerfile index 429fa396..ee872f53 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,4 +8,4 @@ RUN pip install --upgrade pip && \ EXPOSE 5000 -CMD [ "/usr/local/bin/openfisca", "serve", "-b", "0.0.0.0:5000" ] +CMD [ "/usr/local/bin/openfisca", "serve", "-b", "0.0.0.0:8800" ] diff --git a/docker-compose.yml b/docker-compose.yml index 201c6415..b05645f2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,10 +6,7 @@ services: context: . restart: always labels: - - traefik.http.routers.openfisca.rule=Host(`rac.g0v.nz`) - - traefik.http.routers.openfisca.tls=true - - traefik.http.routers.openfisca.tls.certresolver=lets-encrypt - - traefik.port=5000 + lagoon.type: python networks: - web volumes: From f9c1030fdc597416856da28a531856f0a6473ac7 Mon Sep 17 00:00:00 2001 From: Mark Calvert Date: Tue, 18 Jun 2024 10:06:56 +1200 Subject: [PATCH 2/4] Reverted back to port 5000 and configured port for lagoon --- Dockerfile | 2 +- docker-compose.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ee872f53..429fa396 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,4 +8,4 @@ RUN pip install --upgrade pip && \ EXPOSE 5000 -CMD [ "/usr/local/bin/openfisca", "serve", "-b", "0.0.0.0:8800" ] +CMD [ "/usr/local/bin/openfisca", "serve", "-b", "0.0.0.0:5000" ] diff --git a/docker-compose.yml b/docker-compose.yml index b05645f2..a05dd454 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,8 @@ services: context: . restart: always labels: - lagoon.type: python + lagoon.type: basic + lagoon.service.port: 5000 networks: - web volumes: From d5517f64d1a5aabcfdb3b4fc58003e861807ab55 Mon Sep 17 00:00:00 2001 From: Mark Calvert Date: Tue, 18 Jun 2024 10:22:18 +1200 Subject: [PATCH 3/4] Update docker-compose.yml to include Dockerfile in build context --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index a05dd454..f90bcb6e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,6 +4,7 @@ services: openfisca: build: context: . + dockerfile: Dockerfile restart: always labels: lagoon.type: basic From 27d7fd97bf934cd0e30791aa230e4d23bfdd4c61 Mon Sep 17 00:00:00 2001 From: Mark Calvert Date: Tue, 18 Jun 2024 10:42:33 +1200 Subject: [PATCH 4/4] Update .lagoon.yml routes to correct service name --- .lagoon.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.lagoon.yml b/.lagoon.yml index 4eb7cd52..79f94ba4 100644 --- a/.lagoon.yml +++ b/.lagoon.yml @@ -7,7 +7,7 @@ tasks: {} environments: main: routes: - - fisca-py: + - openfisca: - "rac.g0v.nz": tls-acme: false insecure: Redirect