From 2281d3265423d01e60f8cc088de5a5730bb8a910 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Sat, 15 May 2021 13:09:06 +0200 Subject: api: Migrate to Flask Restful This change updates the API to use Flask Restful instead of our own in-house REST library. This change reduces the maintenance effort and allows us to drastically simplify the API implementation needed for the OpenDC v2 API. --- docker-compose.override.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker-compose.override.yml') diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 2f4d8e7b..d42b0c65 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -10,7 +10,7 @@ services: api: ports: - - "8081:8081" + - "8081:80" environment: SENTRY_ENVIRONMENT: "development" -- cgit v1.2.3 From ce95cfdf803043e66e2279d0f76c6bfc64e7864e Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Tue, 18 May 2021 11:18:11 +0200 Subject: ui: Fix frontend deployment scripts This change fixes the deployment scripts necessary for the frontend and ensures that runtime variables work again. --- docker-compose.override.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docker-compose.override.yml') diff --git a/docker-compose.override.yml b/docker-compose.override.yml index d42b0c65..b37068fc 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -4,9 +4,9 @@ version: "3.8" services: frontend: ports: - - "8080:80" + - "8080:3000" environment: - REACT_APP_API_BASE_URL: http://localhost:8081 + NEXT_PUBLIC_API_BASE_URL: http://localhost:8081 api: ports: -- cgit v1.2.3 From 61d74355a7b702917ae314c1c595b24fb8621a21 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Fri, 10 Sep 2021 15:53:59 +0200 Subject: fix(docker): Default to public images for deployment This change updates the Docker Compose configuration to default to the available public images for OpenDC, in order to remove the requirement for building OpenDC locally. --- docker-compose.override.yml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docker-compose.override.yml') diff --git a/docker-compose.override.yml b/docker-compose.override.yml index b37068fc..6202e299 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -3,18 +3,21 @@ version: "3.8" # Docker Compose overrides for development environments services: frontend: + build: opendc-web/opendc-web-ui ports: - "8080:3000" environment: NEXT_PUBLIC_API_BASE_URL: http://localhost:8081 api: + build: opendc-web/opendc-web-api ports: - "8081:80" environment: SENTRY_ENVIRONMENT: "development" simulator: + build: . environment: SENTRY_ENVIRONMENT: "development" -- cgit v1.2.3