diff --git a/Dockerfile b/Dockerfile index ecebd1c25fa2f551943745424879f8bf854f97ac..dbc46c3c41d4b77c1f7c9af51c46982e9e953773 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,10 @@ COPY ./webapp /app/webapp WORKDIR /app/webapp # Install npm dependencies RUN npm install -RUN npm rebuild node-sass + +# For windows environment, with already a node_modules folder, we need reinstall the node-sass package +#RUN npm rebuild node-sass + # Building the Angular app /dist i18n RUN npm run build-i18n diff --git a/proxy.conf b/proxy.conf index aeb138e09c8db62de609d4e92a45376bb41a1060..f8055d32f83dad98e2950f1028d16e4c4dd75700 100644 --- a/proxy.conf +++ b/proxy.conf @@ -1,6 +1,6 @@ server { listen 80; - server_name _; + server_name localhost; location / { proxy_pass https://elastic2.recette.data.grandlyon.com/elastic/; diff --git a/webapp/src/environments/environment.ts b/webapp/src/environments/environment.ts index 33055bf25c32560c64398aeb48f997f7843a5370..dccd58875bcd35a8238af44409663fe8853f2540 100644 --- a/webapp/src/environments/environment.ts +++ b/webapp/src/environments/environment.ts @@ -12,7 +12,7 @@ export const environment = { }, angularAppHost: { - fr: 'http://localhost:8080/fr', - en: 'http://localhost:8080/en' + fr: '/fr', + en: '/en' } };