Skip to content
Snippets Groups Projects
Verified Commit f0d7997f authored by Daniel Göbel's avatar Daniel Göbel
Browse files

Use GitLabs dependency proxy in CI pipeline

#78
parent 745df9b9
No related branches found
No related tags found
2 merge requests!84Remove development branch,!74Resolve "Use dependency proxy in CI pipeline"
image: node:18 image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/node:18
cache: cache:
paths: paths:
- node_modules - node_modules
...@@ -36,13 +36,13 @@ build: ...@@ -36,13 +36,13 @@ build:
build-publish-dev-docker-container-job: build-publish-dev-docker-container-job:
stage: deploy stage: deploy
image: image:
name: gcr.io/kaniko-project/executor:v1.16.0-debug name: gcr.io/kaniko-project/executor:v1.17.0-debug
entrypoint: [""] entrypoint: [""]
only: only:
refs: refs:
- development - development
before_script: before_script:
- echo "{\"auths\":{\"${CI_REGISTRY}\":{\"auth\":\"$(printf "%s:%s" "${CI_REGISTRY_USER}" "${CI_REGISTRY_PASSWORD}" | base64 | tr -d '\n')\"},\"$CI_DEPENDENCY_PROXY_SERVER\":{\"auth\":\"$(printf "%s:%s" ${CI_DEPENDENCY_PROXY_USER} "${CI_DEPENDENCY_PROXY_PASSWORD}" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json - echo "{\"auths\":{\"${CI_REGISTRY}\":{\"auth\":\"$(printf "%s:%s" "${CI_REGISTRY_USER}" "${CI_REGISTRY_PASSWORD}" | base64 | tr -d '\n')\"},\"$(echo -n $CI_DEPENDENCY_PROXY_SERVER | awk -F[:] '{print $1}')\":{\"auth\":\"$(printf "%s:%s" ${CI_DEPENDENCY_PROXY_USER} "${CI_DEPENDENCY_PROXY_PASSWORD}" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json
script: script:
- /kaniko/executor - /kaniko/executor
--context "${CI_PROJECT_DIR}" --context "${CI_PROJECT_DIR}"
...@@ -53,12 +53,12 @@ build-publish-dev-docker-container-job: ...@@ -53,12 +53,12 @@ build-publish-dev-docker-container-job:
build-publish-docker-container-job: build-publish-docker-container-job:
stage: deploy stage: deploy
image: image:
name: gcr.io/kaniko-project/executor:v1.16.0-debug name: gcr.io/kaniko-project/executor:v1.17.0-debug
entrypoint: [""] entrypoint: [""]
only: only:
- tags - tags
before_script: before_script:
- echo "{\"auths\":{\"${CI_REGISTRY}\":{\"auth\":\"$(printf "%s:%s" "${CI_REGISTRY_USER}" "${CI_REGISTRY_PASSWORD}" | base64 | tr -d '\n')\"},\"$CI_DEPENDENCY_PROXY_SERVER\":{\"auth\":\"$(printf "%s:%s" ${CI_DEPENDENCY_PROXY_USER} "${CI_DEPENDENCY_PROXY_PASSWORD}" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json - echo "{\"auths\":{\"${CI_REGISTRY}\":{\"auth\":\"$(printf "%s:%s" "${CI_REGISTRY_USER}" "${CI_REGISTRY_PASSWORD}" | base64 | tr -d '\n')\"},\"$(echo -n $CI_DEPENDENCY_PROXY_SERVER | awk -F[:] '{print $1}')\":{\"auth\":\"$(printf "%s:%s" ${CI_DEPENDENCY_PROXY_USER} "${CI_DEPENDENCY_PROXY_PASSWORD}" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json
script: script:
- /kaniko/executor - /kaniko/executor
--context "${CI_PROJECT_DIR}" --context "${CI_PROJECT_DIR}"
......
# build stage # build stage
FROM node:18 as build-stage FROM gitlab.ub.uni-bielefeld.de/cmg/clowm/dependency_proxy/containers/node:18 as build-stage
WORKDIR /app WORKDIR /app
COPY package.json ./ COPY package.json ./
COPY package-lock.json ./ COPY package-lock.json ./
...@@ -8,7 +8,7 @@ COPY . . ...@@ -8,7 +8,7 @@ COPY . .
RUN npm run build-only RUN npm run build-only
# production stage # production stage
FROM nginx:stable-alpine as production-stage FROM gitlab.ub.uni-bielefeld.de/cmg/clowm/dependency_proxy/containers/nginx:stable-alpine as production-stage
HEALTHCHECK --interval=30s --timeout=4s CMD curl --head -f http://localhost || exit 1 HEALTHCHECK --interval=30s --timeout=4s CMD curl --head -f http://localhost || exit 1
COPY --from=build-stage /app/dist /usr/share/nginx/html COPY --from=build-stage /app/dist /usr/share/nginx/html
COPY --from=build-stage /app/src/assets/env.template.js /tmp COPY --from=build-stage /app/src/assets/env.template.js /tmp
......
This diff is collapsed.
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
"generate-workflow-client": "openapi --input http://localhost:9999/api/workflow-service/openapi.json --output src/client/workflow --client axios" "generate-workflow-client": "openapi --input http://localhost:9999/api/workflow-service/openapi.json --output src/client/workflow --client axios"
}, },
"dependencies": { "dependencies": {
"@aws-sdk/client-s3": "^3.379.1", "@aws-sdk/client-s3": "^3.440.0",
"@aws-sdk/lib-storage": "^3.379.1", "@aws-sdk/lib-storage": "^3.440.0",
"@aws-sdk/s3-request-presigner": "^3.379.1", "@aws-sdk/s3-request-presigner": "^3.440.0",
"@fortawesome/fontawesome-free": "~6.4.2", "@fortawesome/fontawesome-free": "~6.4.2",
"@popperjs/core": "~2.11.8", "@popperjs/core": "~2.11.8",
"ajv": "~8.12.0", "ajv": "~8.12.0",
......
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