Switch to gitlab hosted base image (Swift 5.5)

selichter · Aug 17, 2021 · 0250714 · 0250714
1 parent d76231b
commit 0250714
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 37 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
     name: Test
     runs-on: ubuntu-latest
     container:
-      image: finestructure/spi-base:0.5.2
+      image: registry.gitlab.com/finestructure/spi-base:0.6.0
     services:
       postgres:
         image: postgres:11.6-alpine

diff --git a/Dockerfile b/Dockerfile
@@ -15,7 +15,7 @@
 # ================================
 # Build image
 # ================================
-FROM finestructure/spi-base:0.5.2 as build
+FROM registry.gitlab.com/finestructure/spi-base:0.6.0 as build
 WORKDIR /build
 
 # First just resolve dependencies.
@@ -38,7 +38,7 @@ RUN swift build \
 # Run image
 # ================================
 # we need a special base image so that we can run `swift dump-package`
-FROM finestructure/spi-base:0.5.2
+FROM registry.gitlab.com/finestructure/spi-base:0.6.0
 
 WORKDIR /run
 

diff --git a/Dockerfile.base b/Dockerfile.base
diff --git a/Makefile b/Makefile
@@ -43,7 +43,8 @@ docker-push:
 
 test-docker:
 	@# run tests inside a docker container
-	docker run --rm -v "$(PWD)":/host -w /host --network="host" finestructure/spi-base:0.5.2 \
+	docker run --rm -v "$(PWD)":/host -w /host --network="host" \
+	  registry.gitlab.com/finestructure/spi-base:0.6.0 \
 	  make test
 
 test-e2e: db-reset reconcile ingest analyze