diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d619f5c2..d51bb20f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,56 +10,26 @@ build: stage: build image: name: docker - variables: - BRANDING: villasweb - DOCKER_TAG: ${CI_COMMIT_BRANCH}-${BRANDING} script: - - docker build --build-arg REACT_APP_BRAND=${BRANDING} --tag ${DOCKER_IMAGE}:${DOCKER_TAG} . + - docker build --build-arg REACT_APP_BRAND=${BRANDING} --tag ${DOCKER_IMAGE}:${CI_COMMIT_BRANCH} . tags: - docker -build.slew: - variables: - BRANDING: slew - DOCKER_TAG: ${CI_COMMIT_BRANCH}-${BRANDING} - extends: build - -build.opalrt: - variables: - BRANDING: opalrt - DOCKER_TAG: ${CI_COMMIT_BRANCH}-${BRANDING} - extends: build - deploy: stage: deploy - variables: - BRANDING: villasweb - DOCKER_TAG: ${CI_COMMIT_BRANCH}-${BRANDING} before_script: - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY} script: - - docker push ${DOCKER_IMAGE}:${DOCKER_TAG} + - docker push ${DOCKER_IMAGE}:${CI_COMMIT_BRANCH} tags: - docker dependencies: - build -deploy.slew: - extends: deploy - variables: - BRANDING: slew - DOCKER_TAG: ${CI_COMMIT_BRANCH}-${BRANDING} - -deploy.opalrt: - extends: deploy - variables: - BRANDING: opalrt - DOCKER_TAG: ${CI_COMMIT_BRANCH}-${BRANDING} - deploy.latest: extends: deploy variables: DOCKER_TAG: latest only: refs: - - master + - master \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 8afedf20..9d7aae3e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,23 +15,33 @@ # along with VILLASweb. If not, see . # ****************************************************************************** -FROM node:16.5 AS builder + FROM node:16.5 AS builder -# Create app directory -RUN mkdir -p /usr/src/app -WORKDIR /usr/src/app - -# use changes to package.json to force Docker not to use the cache -# when we change our application's nodejs dependencies: -ADD package.json /usr/src/app -RUN npm install --force - -# Install app dependencies -ARG REACT_APP_BRAND -COPY . /usr/src/app -# Production build, CI=false prevents warnings from being treated as errors -RUN CI=false npm run build - -FROM nginx - -COPY --from=builder /usr/src/app/build /usr/share/nginx/html + # Create app directory + RUN mkdir -p /usr/src/app + WORKDIR /usr/src/app + + # use changes to package.json to force Docker not to use the cache + # when we change our application's nodejs dependencies: + ADD package.json /usr/src/app + RUN npm install --force + + # Install app dependencies + ARG REACT_APP_BRAND + COPY . /usr/src/app + # Production build, CI=false prevents warnings from being treated as errors + RUN CI=false npm run build + WORKDIR /usr/src/app/build + + RUN sed -i 's/<\/body>/