Skip to content

Commit 9983e2e

Browse files
committed
Update to spi-base:1.2.0
# Conflicts: # .devcontainer/Dockerfile # .github/workflows/ci.yml # .github/workflows/query-performance.yml # Dockerfile # LOCAL_DEVELOPMENT_SETUP.md # Makefile
1 parent 23fdd7a commit 9983e2e

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

.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:1.1.1
1+
FROM registry.gitlab.com/finestructure/spi-base:1.2.0
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:1.1.1
32+
image: registry.gitlab.com/finestructure/spi-base:1.2.0
3333
options: --privileged
3434
services:
3535
postgres:
@@ -64,7 +64,7 @@ jobs:
6464
name: Release build
6565
runs-on: ubuntu-latest
6666
container:
67-
image: registry.gitlab.com/finestructure/spi-base:1.1.1
67+
image: registry.gitlab.com/finestructure/spi-base:1.2.0
6868
options: --privileged
6969
steps:
7070
- 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:1.1.1
31+
image: registry.gitlab.com/finestructure/spi-base:1.2.0
3232
steps:
3333
- name: Checkout code
3434
uses: actions/checkout@v4

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:1.1.1 as build
21+
FROM registry.gitlab.com/finestructure/spi-base:1.2.0 as build
2222

2323
# Set up a build area
2424
WORKDIR /build
@@ -61,7 +61,7 @@ RUN [ -d /build/Resources ] && { mv /build/Resources ./Resources && chmod -R a-w
6161
# ================================
6262
# Run image
6363
# ================================
64-
FROM registry.gitlab.com/finestructure/spi-base:1.1.1
64+
FROM registry.gitlab.com/finestructure/spi-base:1.2.0
6565

6666
# NB sas 2022-09-23: We're not using a dedicated `vapor` user to run the executable, because it
6767
# 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
@@ -236,7 +236,7 @@ The trickiest part of this is to ensure the test or app container can connect to
236236
So, in order to run the tests in a Linux container run:
237237

238238
```
239-
docker run --rm -v "$PWD":/host -w /host --add-host=host.docker.internal:host-gateway registry.gitlab.com/finestructure/spi-base:1.1.1 swift test
239+
docker run --rm -v "$PWD":/host -w /host --add-host=host.docker.internal:host-gateway registry.gitlab.com/finestructure/spi-base:1.2.0 swift test
240240
```
241241

242242
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
@@ -68,7 +68,7 @@ test-docker:
6868
@# run tests inside a docker container
6969
docker run --rm -v "$(PWD)":/host -w /host \
7070
--add-host=host.docker.internal:host-gateway \
71-
registry.gitlab.com/finestructure/spi-base:1.1.1 \
71+
registry.gitlab.com/finestructure/spi-base:1.2.0 \
7272
make test
7373

7474
test-e2e: db-reset reconcile ingest analyze

0 commit comments

Comments
 (0)