sr2/link-stack
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More registry path fixes

Browse source
This commit is contained in:
Darren Clarke 2023-03-31 10:28:24 +02:00
parent 25acf59ada
commit f074ec264f
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/leafcutter/.gitlab-ci.yml
View file

@ -10,7 +10,7 @@ leafcutter-docker-build:
- docker:dind - docker:dind
stage: docker-build stage: docker-build
variables: variables:
DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/leafcutter DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link-stack/leafcutter
DOCKER_TAG: ${CI_COMMIT_SHORT_SHA} DOCKER_TAG: ${CI_COMMIT_SHORT_SHA}
script: script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
@ -22,7 +22,7 @@ leafcutter-docker-release:
- docker:dind - docker:dind
stage: docker-release stage: docker-release
variables: variables:
DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/leafcutter DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link-stack/leafcutter
DOCKER_TAG: ${CI_COMMIT_SHORT_SHA} DOCKER_TAG: ${CI_COMMIT_SHORT_SHA}
DOCKER_TAG_NEW: ${CI_COMMIT_REF_NAME} DOCKER_TAG_NEW: ${CI_COMMIT_REF_NAME}
only: only:

2
apps/leafcutter/Makefile
View file

@ -2,7 +2,7 @@ PACKAGE_NAME ?= $(shell jq -r '.name' package.json)
PACKAGE_VERSION?= $(shell jq -r '.version' package.json) PACKAGE_VERSION?= $(shell jq -r '.version' package.json)
BUILD_DATE ?=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ") BUILD_DATE ?=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
DOCKER_ARGS ?= DOCKER_ARGS ?=
DOCKER_NS ?= registry.gitlab.com/digiresilience/link/${PACKAGE_NAME} DOCKER_NS ?= registry.gitlab.com/digiresilience/link/link-stack/${PACKAGE_NAME}
DOCKER_TAG ?= test DOCKER_TAG ?= test
DOCKER_BUILD := docker build ${DOCKER_ARGS} --build-arg BUILD_DATE=${BUILD_DATE} DOCKER_BUILD := docker build ${DOCKER_ARGS} --build-arg BUILD_DATE=${BUILD_DATE}
DOCKER_BUILD_FRESH := ${DOCKER_BUILD} --pull --no-cache DOCKER_BUILD_FRESH := ${DOCKER_BUILD} --pull --no-cache

4
apps/leafcutter/package.json
View file

@ -3,8 +3,8 @@
"version": "0.1.54", "version": "0.1.54",
"scripts": { "scripts": {
"dev": "next dev", "dev": "next dev",
"login": "aws sso login --profile cdr-leafcutter-dashboard-prod-sso", "login": "aws sso login --profile cdr-leafcutter-dashboard-production",
"kubeconfig": "aws eks update-kubeconfig --name cdr-leafcutter-dashboard-cluster --profile cdr-leafcutter-dashboard-prod-sso", "kubeconfig": "aws eks update-kubeconfig --name cdr-leafcutter-dashboard-cluster --profile cdr-leafcutter-dashboard-production",
"fwd:opensearch": "kubectl port-forward opensearch-cluster-master-0 9200:9200 --namespace leafcutter", "fwd:opensearch": "kubectl port-forward opensearch-cluster-master-0 9200:9200 --namespace leafcutter",
"fwd:dashboards": "kubectl port-forward opensearch-dashboards-1-59854cdb9b-vgmtf 5602:5601 --namespace leafcutter", "fwd:dashboards": "kubectl port-forward opensearch-dashboards-1-59854cdb9b-vgmtf 5602:5601 --namespace leafcutter",
"build": "next build", "build": "next build",

4
apps/link/.gitlab-ci.yml
View file

@ -10,7 +10,7 @@ link-docker-build:
- docker:dind - docker:dind
stage: docker-build stage: docker-build
variables: variables:
DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link-stack/link
DOCKER_TAG: ${CI_COMMIT_SHORT_SHA} DOCKER_TAG: ${CI_COMMIT_SHORT_SHA}
script: script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
@ -22,7 +22,7 @@ link-docker-release:
- docker:dind - docker:dind
stage: docker-release stage: docker-release
variables: variables:
DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link-stack/link
DOCKER_TAG: ${CI_COMMIT_SHORT_SHA} DOCKER_TAG: ${CI_COMMIT_SHORT_SHA}
DOCKER_TAG_NEW: ${CI_COMMIT_REF_NAME} DOCKER_TAG_NEW: ${CI_COMMIT_REF_NAME}
only: only:

2
apps/link/Makefile
View file

@ -2,7 +2,7 @@ PACKAGE_NAME ?= $(shell jq -r '.name' package.json)
PACKAGE_VERSION?= $(shell jq -r '.version' package.json) PACKAGE_VERSION?= $(shell jq -r '.version' package.json)
BUILD_DATE ?=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ") BUILD_DATE ?=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
DOCKER_ARGS ?= DOCKER_ARGS ?=
DOCKER_NS ?= registry.gitlab.com/digiresilience/link/${PACKAGE_NAME} DOCKER_NS ?= registry.gitlab.com/digiresilience/link/link-stack/${PACKAGE_NAME}
DOCKER_TAG ?= test DOCKER_TAG ?= test
DOCKER_BUILD := docker build ${DOCKER_ARGS} --build-arg BUILD_DATE=${BUILD_DATE} DOCKER_BUILD := docker build ${DOCKER_ARGS} --build-arg BUILD_DATE=${BUILD_DATE}
DOCKER_BUILD_FRESH := ${DOCKER_BUILD} --pull --no-cache DOCKER_BUILD_FRESH := ${DOCKER_BUILD} --pull --no-cache