diff --git a/Dockerfile b/Dockerfile index de073df464578b69b4d97bd44fcdab2519e50a2c..83be11124a5f29739d9eec1be917877e9bf2ee1f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,13 +23,15 @@ ARG conf RUN npm run build:dev # Stage 1, based on Nginx, to have only the compiled app -FROM nginx:1.16.0-alpine +FROM nginx # copy artifact build from the 'build environment' +RUN apt-get update COPY --from=build /app/dist/fr /usr/share/nginx/html RUN touch /var/run/nginx.pid +RUN ls -l /usr/share/nginx/html # expose port 8080 EXPOSE 8080 diff --git a/angular.json b/angular.json index a41d8047cf334587bfcd0b6b032a683a91471779..1388d5261931d45167cb847070b77f780450bb95 100644 --- a/angular.json +++ b/angular.json @@ -23,7 +23,7 @@ "build": { "builder": "@angular-devkit/build-angular:browser", "options": { - "outputPath": "dist/pamn", + "outputPath": "dist/", "index": "src/index.html", "main": "src/main.ts", "polyfills": "src/polyfills.ts", diff --git a/package.json b/package.json index 8c71c182f7999d0f66f2979bf5d8a6284af992c4..db0c26f558ee1dc481107541399eefefcd6c894c 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "scripts": { "ng": "ng", "start": "ng serve --configuration=fr --proxy-config proxy.conf.json", - "build:prod": "ng build --configuration=production,fr --output-path=dist", - "build:dev": "ng build --configuration=fr --output-path=dist", + "build:prod": "ng build --prod --configuration=production,fr --output-path=dist", + "build:dev": "ng build --prod --configuration=fr --output-path=dist", "test": "ng test", "lint": "ng lint", "e2e": "ng e2e",