From dd7368755556cfed49759bb897914ed622e02a54 Mon Sep 17 00:00:00 2001
From: James Houlahan <james.houlahan@protonmail.com>
Date: Thu, 16 Jul 2020 15:37:44 +0200
Subject: [PATCH] ci: switch to using container from bridge-internal

---
 .gitlab-ci.yml | 22 +++++++++++-----------
 ci/Dockerfile  |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 466d8829..780d768c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ before_script:
 cache:
   key: go-mod
   paths:
-  - .cache
+    - .cache
   policy: pull
 
 stages:
@@ -31,19 +31,19 @@ build-ci-image:
   before_script: []
   cache: {}
   tags:
-  - heavy
+    - heavy
   only:
     changes:
-    - ci/*
+      - ci/*
   services:
-  - docker:dind
+    - docker:dind
   variables:
     DOCKER_HOST: tcp://docker:2375
   script:
-  - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-  - docker info
-  - docker build -t gitlab.protontech.ch:4567/go/bridge/ci:latest ci
-  - docker push gitlab.protontech.ch:4567/go/bridge/ci:latest
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker info
+    - docker build -t gitlab.protontech.ch:4567/go/bridge/ci:latest ci
+    - docker push gitlab.protontech.ch:4567/go/bridge/ci:latest
 
 # Stage: CACHE
 
@@ -54,11 +54,11 @@ cache-push:
   only:
     - branches
   script:
-  - echo ""
+    - echo ""
   cache:
     key: go-mod
     paths:
-    - .cache
+      - .cache
 
 # Stage: TEST
 
@@ -140,7 +140,7 @@ build-darwin:
 build-windows:
   stage: build
   services:
-  - docker:dind
+    - docker:dind
   only:
     - branches
   variables:
diff --git a/ci/Dockerfile b/ci/Dockerfile
index 59edb3a6..02acc2ec 100644
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -1,4 +1,4 @@
-FROM gitlab.protontech.ch:4567/protonmail/ci-containers/go
+FROM gitlab.protontech.ch:4567/go/bridge-internal
 
 RUN apt-get -y update
 RUN apt-get -y install openssh-client libsecret-1-dev libgl1-mesa-dev time connect-proxy