From 1a6a09795d05d20cb7cb8ff4d49448d83f407e1d Mon Sep 17 00:00:00 2001 From: Benhammou Mohammed Rachid <mrbenhammou@takima.fr> Date: Thu, 23 May 2024 15:16:58 +0200 Subject: [PATCH] update gitlab-ci.yaml --- .dockerignore | 4 ---- .gitlab-ci.yml | 8 ++++---- Dockerfile | 12 ------------ nginx-custom.conf | 20 -------------------- 4 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 .dockerignore delete mode 100644 Dockerfile delete mode 100644 nginx-custom.conf diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index f56ff1c..0000000 --- a/.dockerignore +++ /dev/null @@ -1,4 +0,0 @@ -/node_modules -.idea -.prettierrc.json -yarn-error.log diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e955509..23ce429 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,17 +5,17 @@ include: file: "templates/frontend/.frontend-angular-npm-node-18.yml" variables: - TARGET_APP_NAME: allocine - USE_LOCAL_DOCKERFILE: "true" - ARTIFACT_PATH: dist + TARGET_APP_NAME: front + ARTIFACT_PATH: dist/allocinefront/browser build: artifacts: paths: - - dist + - dist/allocinefront variables: SIZE: large + test: variables: SIZE: large diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index ebc5caf..0000000 --- a/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM node:18-alpine as build-stage - -WORKDIR /app -COPY package*.json /app/ -RUN npm install -COPY ./ /app/ -ARG configuration=production -RUN npm run build -- --output-path=./dist/out --configuration $configuration - -FROM nginx:1.15 -COPY --from=build-stage /app/dist/out/ /usr/share/nginx/html -COPY ./nginx-custom.conf /etc/nginx/conf.d/default.conf diff --git a/nginx-custom.conf b/nginx-custom.conf deleted file mode 100644 index 2c11f9b..0000000 --- a/nginx-custom.conf +++ /dev/null @@ -1,20 +0,0 @@ -# Expires map -map $sent_http_content_type $expires { - default off; - text/html epoch; - text/css max; - application/json max; - application/javascript max; - ~image/ max; -} - -server { - listen 80; - location / { - root /usr/share/nginx/html; - index index.html index.htm; - try_files $uri $uri/ /index.html =404; - } - expires $expires; - gzip on; -} \ No newline at end of file -- GitLab