From afc68c28f9a35e00659b0fbbc836cfa65c09c814 Mon Sep 17 00:00:00 2001 From: Dobromir Palushev <dobromir@peaksandpies.com> Date: Fri, 2 Sep 2022 22:47:27 +0200 Subject: [PATCH] aand another try --- .gitlab-ci.yml | 2 ++ app/Dockerfile | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1da4a4b..4d72f08 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,6 +42,8 @@ run-tests: - docker build --tag "${CONTAINER_TAG}-test" --target=test + --build-arg MONGODB_URL_TEST=mongodb://containerhost:27017/todo-app + --build-arg JWT_SECRET_TEST=<my-very-secret-jwt> --add-host=host.docker.internal:localhost "./app" # - echo ‘http://dl-cdn.alpinelinux.org/alpine/v3.6/main’ >> /etc/apk/repositories diff --git a/app/Dockerfile b/app/Dockerfile index 459a5c7..c90d427 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -5,6 +5,10 @@ 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=<dynamically-set-from-k8s> \ MONGODB_URL=<dynamically-set-from-k8s> \ @@ -32,9 +36,8 @@ 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> +ARG MONGODB_URL_TEST +ARG JWT_SECRET_TEST # MONGODB_URL and JWT_SECRET are available as env variables RUN MONGODB_URL=$MONGODB_URL_TEST JWT_SECRET=$JWT_SECRET_TEST npm run test -- GitLab