Theaninova/openstapps
1
0
Fork 0
mirror of https://gitlab.com/openstapps/openstapps.git synced 2026-01-05 13:02:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'proxy/master'

Browse Source
This commit is contained in:
Thea Schöbl
2023-05-24 13:14:30 +02:00
parent f69edc6393 23d0c6971c
commit c8703ec66b
3 changed files with 293 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/proxy/.gitlab-ci.yml
View File

@@ -67,11 +67,11 @@ docker image:
services: services:
- docker:dind - docker:dind
script: script:
- export VERSION=$(echo -n "$CI_BUILD_REF_NAME" | cut -c 2-) - export VERSION=$(echo -n "$CI_COMMIT_REF_NAME" | cut -c 2-)
- export IMAGETAG_BASE=$CI_REGISTRY_IMAGE - export IMAGETAG_BASE=$CI_REGISTRY_IMAGE
- export IMAGETAG_VERSION=$IMAGETAG_BASE:$VERSION - export IMAGETAG_VERSION=$IMAGETAG_BASE:$VERSION
- export IMAGETAG_LATEST=$IMAGETAG_BASE:latest - export IMAGETAG_LATEST=$IMAGETAG_BASE:latest
- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker build -t $IMAGETAG_VERSION -t $IMAGETAG_LATEST . - docker build -t $IMAGETAG_VERSION -t $IMAGETAG_LATEST .
- docker push $IMAGETAG_BASE - docker push $IMAGETAG_BASE
only: only:

569
backend/proxy/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

10
backend/proxy/package.json
View File

@@ -6,21 +6,21 @@
"dependencies": { "dependencies": {
"@openstapps/logger": "1.1.1", "@openstapps/logger": "1.1.1",
"@types/config": "3.3.0", "@types/config": "3.3.0",
"@types/dockerode": "3.3.14", "@types/dockerode": "3.3.17",
"@types/node": "14.18.36", "@types/node": "14.18.36",
"@types/sha1": "1.1.3", "@types/sha1": "1.1.3",
"config": "3.3.8", "config": "3.3.9",
"dockerode": "3.3.4", "dockerode": "3.3.5",
"is-cidr": "4.0.2", "is-cidr": "4.0.2",
"mustache": "4.2.0", "mustache": "4.2.0",
"node-port-scanner": "3.0.1", "node-port-scanner": "3.0.1",
"semver": "7.3.8" "semver": "7.3.8"
}, },
"devDependencies": { "devDependencies": {
"@openstapps/configuration": "0.33.0", "@openstapps/configuration": "0.34.0",
"@openstapps/eslint-config": "1.1.0", "@openstapps/eslint-config": "1.1.0",
"@testdeck/mocha": "0.3.3", "@testdeck/mocha": "0.3.3",
"@types/chai": "4.3.4", "@types/chai": "4.3.5",
"@types/chai-spies": "1.0.3", "@types/chai-spies": "1.0.3",
"@types/mustache": "4.2.2", "@types/mustache": "4.2.2",
"@types/proxyquire": "1.3.28", "@types/proxyquire": "1.3.28",