.gitlab-ci.yml

@@ -7,9 +7,10 @@ workflow:
 
 variables:
   DOCKER_VERSION: '20.10.17'
-  K8S_VERSION: '1.24'
-  GOOGLE_CLOUD_SDK_IMAGE_VERSION: '400.0.0'
+  MONGO_VERSION: '4.4'
   K8S_NAMESPACE: 'todoapp-devops'
+  GOOGLE_CLOUD_SDK_IMAGE_VERSION: '400.0.0'
+  GCP_COMPUTE_REGION: 'europe-west4a'
   CONTAINER_TAG: '${CI_REGISTRY_IMAGE}:${CI_PIPELINE_IID}-${CI_COMMIT_SHORT_SHA}'
 
 stages:
@@ -26,25 +27,45 @@ stages:
     - gcloud config set compute/zone ${GCP_COMPUTE_REGION}
     - gcloud container clusters get-credentials ${GCP_PROJECT_ID}-gke
 
-test-image:
+run-tests:
   stage: test
   tags:
     - docker-privileged
+    # - docker
   image: docker:${DOCKER_VERSION}
+  # image:  node:16.17.0-alpine
   services:
     - name: docker:${DOCKER_VERSION}-dind
+      alias: containerhost
   script:
+    - docker run -p 27017:27017 -d --name mongo-container --rm mongo:${MONGO_VERSION}
     - docker build
       --tag "${CONTAINER_TAG}-test"
       --target=test
+      --add-host=host.docker.internal:172.17.0.1
       "./app"
+    # - echo ‘http://dl-cdn.alpinelinux.org/alpine/v3.6/main’ >> /etc/apk/repositories
+    # - echo ‘http://dl-cdn.alpinelinux.org/alpine/v3.6/community’ >> /etc/apk/repositories
+    # - apk update
+    # - apk add mongodb mongodb-tools
+    # - mkdir -p /data/db/
+    # - mongod --config "./app/server/dev.mongo.conf"
+    # - cd "./app/client"
+    # - npm ci --no-audit --no-fund
+    # - npm run test
+    # - cd "../server"
+    # - npm ci --no-audit --no-fund
+    # - MONGODB_URL=mongodb://localhost:27017/todo-app JWT_SECRET=a-big-secret npm run test
+    # - jest --ci
   after_script:
+    - docker stop mongo-container
+    - docker images -a | grep "mongo" | awk '{print $3}' | xargs docker rmi --force
     - docker image rm --force "${CONTAINER_TAG}-test"
 
 build-image:
   stage: build
   needs:
-    - 'test-image'
+    - 'run-tests'
   tags:
     - docker-privileged
   image: docker:${DOCKER_VERSION}
@@ -67,9 +88,6 @@ build-image:
 
 create-release_image:
   stage: release
-  rules:
-    - if: $CI_COMMIT_REF_NAME =~ /main/
-      when: 'always'
   tags:
     - docker-privileged
   image: docker:${DOCKER_VERSION}

app/Dockerfile

@@ -5,11 +5,14 @@ ARG NODEJS_VERSION='16.17.0'
 
 FROM node:$NODEJS_VERSION-alpine AS base
 
+ARG \
+    MONGODB_URL_TEST=mongodb://host.docker.internal:27017/todo-app \
+    JWT_SECRET_TEST=<my-very-secret-jwt>
+
 ENV \
-    PORT=3000 \
-    # For local dev - mongodb://host.docker.internal:27017/todo-app
-    MONGODB_URL=<should-be-dynamically-set> \
-    JWT_SECRET=<should-be-dynamically-set>
+    PORT=<dynamically-set-from-k8s> \
+    MONGODB_URL=<dynamically-set-from-k8s> \
+    JWT_SECRET=<dynamically-set-from-k8s>
 
 # ------------------------------------------------------------------
 # Test stage
@@ -29,12 +32,16 @@ WORKDIR /server
 
 COPY ./server/src ./src/
 
-COPY ./server/package*.json .
+COPY ./server/package*.json ./
 
 RUN npm ci --no-audit --no-fund
 
+ARG \
+    MONGODB_URL_TEST=mongodb://host.docker.internal:27017/todo-app \
+    JWT_SECRET_TEST=<my-very-secret-jwt>
+
 # MONGODB_URL and JWT_SECRET are available as env variables
-RUN npm run test
+RUN MONGODB_URL=$MONGODB_URL_TEST JWT_SECRET=$JWT_SECRET_TEST npm run test
 
 # ------------------------------------------------------------------
 # Build stage
@@ -47,7 +54,7 @@ WORKDIR $APP_BUILD_PATH
 
 COPY ./server/src .
 
-COPY ./server/package*.json .
+COPY ./server/package*.json ./
 
 RUN \
     npm ci --prod --no-audit --no-fund \

k8s-manifests/configmap.yaml

@@ -4,6 +4,4 @@ metadata:
   name: todo-app-config
 data:
   PORT: 3000
-  # MONGODB_URL: mongodb://<mongo-service>:27017/todo-app
-  # mongodb-service.<namespace>?
   MONGODB_URL: mongodb-service