Commit 4aa0d790 authored by Mark Harding's avatar Mark Harding
Browse files

(chore): ci configs

parent 6a3dac72
Loading
Loading
Loading
Loading
+7 −5
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@ variables:
  CYPRESS_CACHE_FOLDER: '$CI_PROJECT_DIR/cache/Cypress'
  CYPRESS_CACHE_FOLDER: '$CI_PROJECT_DIR/cache/Cypress'


test:
test:
  image: circleci/node:8-browsers
  image: circleci/node:13-browsers
  stage: test
  stage: test
  script:
  script:
    - npm ci
    - npm ci
@@ -87,7 +87,8 @@ build:review:
    - npm ci && npm install -g gulp-cli
    - npm ci && npm install -g gulp-cli
    - npm run postinstall
    - npm run postinstall
    - gulp build.sass && gulp build.sass ##weird build needs to be run twice for now
    - gulp build.sass && gulp build.sass ##weird build needs to be run twice for now
    - sh build/base-locale.sh dist
    # - sh build/base-locale.sh dist
    - npm run build:ssr
  artifacts:
  artifacts:
    name: '$CI_COMMIT_REF_SLUG'
    name: '$CI_COMMIT_REF_SLUG'
    paths:
    paths:
@@ -155,8 +156,8 @@ prepare:review:
    - docker:dind
    - docker:dind
  script:
  script:
    - docker login -u gitlab-ci-token -p ${CI_BUILD_TOKEN} ${CI_REGISTRY}
    - docker login -u gitlab-ci-token -p ${CI_BUILD_TOKEN} ${CI_REGISTRY}
    - docker build -t $CI_REGISTRY_IMAGE/front-init:$CI_PIPELINE_ID -f containers/front-init/Dockerfile dist/.
    - docker build -t $CI_REGISTRY_IMAGE/server:$CI_PIPELINE_ID -f containers/server/Dockerfile dist/.
    - docker push $CI_REGISTRY_IMAGE/front-init:$CI_PIPELINE_ID
    - docker push $CI_REGISTRY_IMAGE/server:$CI_PIPELINE_ID
  dependencies:
  dependencies:
    - build:review
    - build:review
  except:
  except:
@@ -233,7 +234,8 @@ review:start:
    - "helm upgrade \
    - "helm upgrade \
      --install \
      --install \
      --reuse-values \
      --reuse-values \
      --set frontInit.image.repository=$CI_REGISTRY_IMAGE/front-init \
      --set nginx.image.tag=ssr \
      --set frontInit.image.repository=$CI_REGISTRY_IMAGE/server \
      --set-string frontInit.image.tag=$CI_PIPELINE_ID \
      --set-string frontInit.image.tag=$CI_PIPELINE_ID \
      --set domain=$CI_BUILD_REF_SLUG.$KUBE_INGRESS_BASE_DOMAIN \
      --set domain=$CI_BUILD_REF_SLUG.$KUBE_INGRESS_BASE_DOMAIN \
      --set elasticsearch.clusterName=$CI_BUILD_REF_SLUG--elasticsearch \
      --set elasticsearch.clusterName=$CI_BUILD_REF_SLUG--elasticsearch \
+3 −1
Original line number Original line Diff line number Diff line
@@ -3,4 +3,6 @@
###
###
FROM node:13-alpine
FROM node:13-alpine


CMD node server
COPY . /dist
 No newline at end of file

CMD node /dist/server
 No newline at end of file
+1 −1

File changed.

Contains only whitespace changes.