From 29978b7014b32c7e258e66ba35e49bbcf6990ff6 Mon Sep 17 00:00:00 2001
From: James Houlahan <james.houlahan@protonmail.com>
Date: Fri, 17 Jul 2020 10:46:45 +0200
Subject: [PATCH] ci: use bridge-internal image

---
 .gitlab-ci.yml | 25 +------------------------
 ci/Dockerfile  |  4 ----
 2 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 ci/Dockerfile

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 780d768c..17bebce5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: gitlab.protontech.ch:4567/go/bridge/ci
+image: gitlab.protontech.ch:4567/go/bridge-internal
 
 before_script:
   - eval $(ssh-agent -s)
@@ -17,34 +17,11 @@ cache:
   policy: pull
 
 stages:
-  - image
   - cache
   - test
   - build
   - mirror
 
-# Stage: IMAGE
-
-build-ci-image:
-  stage: image
-  image: docker:stable
-  before_script: []
-  cache: {}
-  tags:
-    - heavy
-  only:
-    changes:
-      - ci/*
-  services:
-    - 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
-
 # Stage: CACHE
 
 # This will ensure latest dependency versions and updates the cache for
diff --git a/ci/Dockerfile b/ci/Dockerfile
deleted file mode 100644
index 02acc2ec..00000000
--- a/ci/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-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