From 03fbbb41140150f0b9e2b71384787af7a0f21dff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Y=C3=BBki=20Vachot?= Date: Sat, 15 Jan 2022 18:28:49 +0100 Subject: [PATCH] Update: Docker for development --- docker-compose.yml | 1 - frontend/Dockerfile | 2 -- frontend/src/environments/environment.prod.ts | 3 +-- frontend/src/environments/environment.ts | 3 ++- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9c419e7..eeea0db 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -69,4 +69,3 @@ services: - backend environment: - NODE_ENV=development - - API_URL=http://backend/api diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 4b02efb..e57b035 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -2,7 +2,5 @@ FROM node:current-alpine WORKDIR /data/frontend COPY ["package.json", "package-lock.json*", "./"] COPY . . -RUN apk add --no-cache gettext -#RUN envsubst < environments/environment.ts > environments/environment.ts RUN npm install --NODE_ENV RUN npm install -g @angular/cli diff --git a/frontend/src/environments/environment.prod.ts b/frontend/src/environments/environment.prod.ts index 6fd235a..3612073 100644 --- a/frontend/src/environments/environment.prod.ts +++ b/frontend/src/environments/environment.prod.ts @@ -1,4 +1,3 @@ export const environment = { - production: true, - api_url: '${API_URL}' + production: true }; diff --git a/frontend/src/environments/environment.ts b/frontend/src/environments/environment.ts index d219c15..0dfd866 100644 --- a/frontend/src/environments/environment.ts +++ b/frontend/src/environments/environment.ts @@ -2,9 +2,10 @@ // `ng build` replaces `environment.ts` with `environment.prod.ts`. // The list of file replacements can be found in `angular.json`. + export const environment = { production: false, - debutUrl: "http://127.0.0.1:5000/api/" + debutUrl: 'http://127.0.0.1:5000/api/' }; /*