Skip to content
Snippets Groups Projects
Commit 48e4e17f authored by Dobromir Palushev's avatar Dobromir Palushev
Browse files

Merge branch 'just-a-test' into 'staging'

pipeline multiple updates

See merge request !16
parents 0c9b86ce f691ff9d
No related branches found
No related tags found
17 merge requests!72Production update,!70Production update,!67Workflow updates,!66Css test change,!64Pipeline fix,!62Main update,!60Getting staging's latest state,!58Updating Main,!56Main updates,!52Staging->Main,!50Production updates,!47Deployment on main,!45Deployment from main,!41updated logic of the test-job,!39updated logic of the test-job,!37Updating main to reflect staging,!16pipeline multiple updates
Pipeline #19119 failed
...@@ -36,13 +36,13 @@ run-tests: ...@@ -36,13 +36,13 @@ run-tests:
# image: node:16.17.0-alpine # image: node:16.17.0-alpine
services: services:
- name: docker:${DOCKER_VERSION}-dind - name: docker:${DOCKER_VERSION}-dind
alias: containerHost alias: containerhost
script: script:
- docker run -p 27017:27017 -d --name mongo-container --rm mongo:${MONGO_VERSION} - docker run -p 27017:27017 -d --name mongo-container --rm mongo:${MONGO_VERSION}
- docker build - docker build
--tag "${CONTAINER_TAG}-test" --tag "${CONTAINER_TAG}-test"
--target=test --target=test
--add-host=host.docker.internal:containerHost --add-host=host.docker.internal:172.17.0.1
"./app" "./app"
# - echo ‘http://dl-cdn.alpinelinux.org/alpine/v3.6/main’ >> /etc/apk/repositories # - 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 # - echo ‘http://dl-cdn.alpinelinux.org/alpine/v3.6/community’ >> /etc/apk/repositories
......
...@@ -37,8 +37,8 @@ COPY ./server/package*.json ./ ...@@ -37,8 +37,8 @@ COPY ./server/package*.json ./
RUN npm ci --no-audit --no-fund RUN npm ci --no-audit --no-fund
ARG \ ARG \
MONGODB_URL_TEST \ MONGODB_URL_TEST=mongodb://host.docker.internal:27017/todo-app \
JWT_SECRET_TEST JWT_SECRET_TEST=<my-very-secret-jwt>
# MONGODB_URL and JWT_SECRET are available as env variables # MONGODB_URL and JWT_SECRET are available as env variables
RUN MONGODB_URL=$MONGODB_URL_TEST JWT_SECRET=$JWT_SECRET_TEST npm run test RUN MONGODB_URL=$MONGODB_URL_TEST JWT_SECRET=$JWT_SECRET_TEST npm run test
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment