From a8e378377ebad5c6d2051222d001eb9d1aa5f634 Mon Sep 17 00:00:00 2001
From: Ruben Pollan <meskio@sindominio.net>
Date: Thu, 17 Sep 2020 20:10:08 +0200
Subject: [PATCH] [ci] use the registry of the repo
---
.gitlab-ci.yml | 8 ++++----
docker/Makefile | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dfe1899f..0e960ead 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ stages:
- vendor
build_test:
- image: registry.0xacab.org/leap/docker/bitmask-vpn:latest
+ image: registry.0xacab.org/leap/bitmask-vpn:latest
stage: build
script:
- apt update
@@ -22,7 +22,7 @@ build_test:
expire_in: 1 month
# branded_push:
-# image: registry.0xacab.org/leap/docker/bitmask-vpn:latest
+# image: registry.0xacab.org/leap/bitmask-vpn:latest
# stage: push
# only:
# - master
@@ -47,14 +47,14 @@ build_test:
# trigger_deb:
-# image: registry.0xacab.org/leap/docker/buster_amd64:latest
+# image: registry.0xacab.org/leap/buster_amd64:latest
# stage: trigger
# script:
# - echo "Triggering CI pipeline on https://0xacab.org/leap/riseup-vpn_package/pipelines"
# - "curl -X POST -F token=$RISEUP_VPN_DEB_TRIGGER_TOKEN -F ref=master https://0xacab.org/api/v4/projects/1916/trigger/pipeline"
vendorize:
- image: registry.0xacab.org/leap/docker/bitmask-vpn:latest
+ image: registry.0xacab.org/leap/bitmask-vpn:latest
stage: vendor
script:
#- 'PROVIDERS="riseup calyx" make build_all_providers'
diff --git a/docker/Makefile b/docker/Makefile
index d2bc1f2d..bdc00360 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -4,7 +4,7 @@
#########################################################################
IMAGE=bitmask-vpn
-REGISTRY=registry.0xacab.org/leap/docker
+REGISTRY=registry.0xacab.org/leap
PROVIDER=riseup
PRODUCT=$(shell echo $(PROVIDER) | sed -e "s/\b\(.\)/\u\1/g")VPN
--
GitLab