Skip to content

Commit 096e39d

Browse files
committed
Update to Swift 6.3 base image
1 parent 67fb0fd commit 096e39d

6 files changed

Lines changed: 8 additions & 8 deletions

File tree

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.gitlab.com/finestructure/spi-base:2.1.1
1+
FROM registry.gitlab.com/finestructure/spi-base:ebce5430b5d53e41b5f178fc39fbd5456c53f2ac
22

33
# Install SPM build dependencies
44
RUN apt-get update && apt-get install -y curl git make unzip \

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
name: Test
3030
runs-on: ubuntu-latest
3131
container:
32-
image: registry.gitlab.com/finestructure/spi-base:2.1.1
32+
image: registry.gitlab.com/finestructure/spi-base:ebce5430b5d53e41b5f178fc39fbd5456c53f2ac
3333
options: --privileged
3434
steps:
3535
- name: GH Runner bug workaround
@@ -160,7 +160,7 @@ jobs:
160160
name: Release build
161161
runs-on: ubuntu-latest
162162
container:
163-
image: registry.gitlab.com/finestructure/spi-base:2.1.1
163+
image: registry.gitlab.com/finestructure/spi-base:ebce5430b5d53e41b5f178fc39fbd5456c53f2ac
164164
options: --privileged
165165
steps:
166166
- name: GH Runner bug workaround

.github/workflows/query-performance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
runs-on: ubuntu-latest
2929
continue-on-error: true
3030
container:
31-
image: registry.gitlab.com/finestructure/spi-base:2.1.1
31+
image: registry.gitlab.com/finestructure/spi-base:ebce5430b5d53e41b5f178fc39fbd5456c53f2ac
3232
steps:
3333
- name: Checkout code
3434
uses: actions/checkout@v6

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# ================================
1919
# Build image
2020
# ================================
21-
FROM registry.gitlab.com/finestructure/spi-base:2.1.1 AS build
21+
FROM registry.gitlab.com/finestructure/spi-base:ebce5430b5d53e41b5f178fc39fbd5456c53f2ac AS build
2222

2323
# Set up a build area
2424
WORKDIR /build
@@ -65,7 +65,7 @@ RUN [ -d /build/Resources ] && { mv /build/Resources ./Resources && chmod -R a-w
6565
# ================================
6666
# Run image
6767
# ================================
68-
FROM registry.gitlab.com/finestructure/spi-base:2.1.1
68+
FROM registry.gitlab.com/finestructure/spi-base:ebce5430b5d53e41b5f178fc39fbd5456c53f2ac
6969

7070
# NB sas 2022-09-23: We're not using a dedicated `vapor` user to run the executable, because it
7171
# makes managing the data in the checkouts volume difficult. See

LOCAL_DEVELOPMENT_SETUP.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ The trickiest part of this is to ensure the test or app container can connect to
238238
So, in order to run the tests in a Linux container run:
239239

240240
```
241-
docker run --rm -v "$PWD":/host -w /host --add-host=host.docker.internal:host-gateway registry.gitlab.com/finestructure/spi-base:2.1.1 swift test
241+
docker run --rm -v "$PWD":/host -w /host --add-host=host.docker.internal:host-gateway registry.gitlab.com/finestructure/spi-base:ebce5430b5d53e41b5f178fc39fbd5456c53f2ac swift test
242242
```
243243

244244
Make sure you use the most recent `spi-base` image. You can find the latest image name in the `test-docker` target, which also provides a convenient way to run all all tests in a docker container.

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ test-docker:
8989
@# run tests inside a docker container
9090
docker run --rm -v "$(PWD)":/host -w /host \
9191
--add-host=host.docker.internal:host-gateway \
92-
registry.gitlab.com/finestructure/spi-base:2.1.1 \
92+
registry.gitlab.com/finestructure/spi-base:ebce5430b5d53e41b5f178fc39fbd5456c53f2ac \
9393
make test
9494

9595
test-e2e: db-reset reconcile ingest analyze

0 commit comments

Comments
 (0)