Fix registry paths

apps/leafcutter/.gitlab-ci.yml

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

apps/leafcutter/Makefile

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

apps/link/.gitlab-ci.yml

@@ -0,0 +1,33 @@
+link-build:
+  stage: build
+  script:
+    - npm install
+    - cd apps/link && npm run-script build
+
+link-docker-build:
+  image: registry.gitlab.com/guardianproject-ops/docker-alpine-git:latest
+  services:
+    - docker:dind
+  stage: docker-build
+  variables:
+    DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link
+    DOCKER_TAG: ${CI_COMMIT_SHORT_SHA}
+  script:
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - cd apps/link && make docker/build-fresh-push
+
+link-docker-release:
+  image: registry.gitlab.com/guardianproject-ops/docker-alpine-git:latest
+  services:
+    - docker:dind
+  stage: docker-release
+  variables:
+    DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link
+    DOCKER_TAG: ${CI_COMMIT_SHORT_SHA}
+    DOCKER_TAG_NEW: ${CI_COMMIT_REF_NAME}
+  only:
+    - main
+    - develop
+  script:
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - cd apps/link && make docker/add-tag

apps/link/Makefile

@@ -0,0 +1,40 @@
+PACKAGE_NAME ?= $(shell jq -r '.name' package.json)
+PACKAGE_VERSION?= $(shell jq -r '.version' package.json)
+BUILD_DATE   ?=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
+DOCKER_ARGS  ?=
+DOCKER_NS    ?= registry.gitlab.com/digiresilience/link/${PACKAGE_NAME}
+DOCKER_TAG   ?= test
+DOCKER_BUILD := docker build ${DOCKER_ARGS} --build-arg BUILD_DATE=${BUILD_DATE}
+DOCKER_BUILD_FRESH := ${DOCKER_BUILD} --pull --no-cache
+DOCKER_BUILD_ARGS := --build-arg VCS_REF=${CI_COMMIT_SHORT_SHA}
+DOCKER_PUSH  := docker push
+DOCKER_BUILD_TAG := ${DOCKER_NS}:${DOCKER_TAG}
+
+.PHONY: .npmrc
+.EXPORT_ALL_VARIABLES:
+
+.npmrc:
+ifdef CI_JOB_TOKEN
+	echo '@guardianproject-ops:registry=https://gitlab.com/api/v4/packages/npm/' > .npmrc
+	echo '@digiresilience:registry=https://gitlab.com/api/v4/packages/npm/' >> .npmrc
+	echo '//gitlab.com/api/v4/packages/npm/:_authToken=${CI_JOB_TOKEN}' >> .npmrc
+	echo '//gitlab.com/api/v4/projects/:_authToken=${CI_JOB_TOKEN}' >> .npmrc
+	echo '//gitlab.com/api/v4/projects/${CI_PROJECT_ID}/packages/npm/:_authToken=${CI_JOB_TOKEN}' >> .npmrc
+endif
+
+docker/build: .npmrc
+	DOCKER_BUILDKIT=1 ${DOCKER_BUILD} ${DOCKER_BUILD_ARGS} -t ${DOCKER_BUILD_TAG} ${PWD}
+
+docker/build-fresh: .npmrc
+	DOCKER_BUILDKIT=1 ${DOCKER_BUILD_FRESH} ${DOCKER_BUILD_ARGS} -t ${DOCKER_BUILD_TAG} ${PWD}
+
+docker/add-tag:
+	docker pull ${DOCKER_NS}:${DOCKER_TAG}
+	docker tag ${DOCKER_NS}:${DOCKER_TAG} ${DOCKER_NS}:${DOCKER_TAG_NEW}
+	docker push ${DOCKER_NS}:${DOCKER_TAG_NEW}
+
+docker/push:
+	${DOCKER_PUSH} ${DOCKER_BUILD_TAG}
+
+docker/build-push: docker/build docker/push
+docker/build-fresh-push: docker/build-fresh docker/push

apps/link/compose-dev.yaml

@@ -1,11 +0,0 @@
-services:
-  app:
-    entrypoint:
-    - sleep
-    - infinity
-    image: registry.gitlab.com/redaranj/dev-environment:latest
-    init: true
-    volumes:
-    - type: bind
-      source: /var/run/docker.sock
-      target: /var/run/docker.sock