ci: switch to using container from bridge-internal

This commit is contained in:
James Houlahan
2020-07-16 15:37:44 +02:00
parent 5411b29d17
commit dd73687555
2 changed files with 12 additions and 12 deletions

View File

@ -13,7 +13,7 @@ before_script:
cache: cache:
key: go-mod key: go-mod
paths: paths:
- .cache - .cache
policy: pull policy: pull
stages: stages:
@ -31,19 +31,19 @@ build-ci-image:
before_script: [] before_script: []
cache: {} cache: {}
tags: tags:
- heavy - heavy
only: only:
changes: changes:
- ci/* - ci/*
services: services:
- docker:dind - docker:dind
variables: variables:
DOCKER_HOST: tcp://docker:2375 DOCKER_HOST: tcp://docker:2375
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
- docker info - docker info
- docker build -t gitlab.protontech.ch:4567/go/bridge/ci:latest ci - docker build -t gitlab.protontech.ch:4567/go/bridge/ci:latest ci
- docker push gitlab.protontech.ch:4567/go/bridge/ci:latest - docker push gitlab.protontech.ch:4567/go/bridge/ci:latest
# Stage: CACHE # Stage: CACHE
@ -54,11 +54,11 @@ cache-push:
only: only:
- branches - branches
script: script:
- echo "" - echo ""
cache: cache:
key: go-mod key: go-mod
paths: paths:
- .cache - .cache
# Stage: TEST # Stage: TEST
@ -140,7 +140,7 @@ build-darwin:
build-windows: build-windows:
stage: build stage: build
services: services:
- docker:dind - docker:dind
only: only:
- branches - branches
variables: variables:

View File

@ -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 update
RUN apt-get -y install openssh-client libsecret-1-dev libgl1-mesa-dev time connect-proxy RUN apt-get -y install openssh-client libsecret-1-dev libgl1-mesa-dev time connect-proxy