Skip to content

Commit 1cc6889

Browse files
committed
Use 1.2.2 spi-base image with xcbeautify installed
1 parent 3e87654 commit 1cc6889

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:224946a41aedd5106245666d7261a5218ceac0fc
1+
FROM registry.gitlab.com/finestructure/spi-base:1.2.2
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:224946a41aedd5106245666d7261a5218ceac0fc
32+
image: registry.gitlab.com/finestructure/spi-base:1.2.2
3333
options: --privileged
3434
steps:
3535
- name: GH Runner bug workaround
@@ -157,7 +157,7 @@ jobs:
157157
name: Release build
158158
runs-on: ubuntu-latest
159159
container:
160-
image: registry.gitlab.com/finestructure/spi-base:224946a41aedd5106245666d7261a5218ceac0fc
160+
image: registry.gitlab.com/finestructure/spi-base:1.2.2
161161
options: --privileged
162162
steps:
163163
- 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:224946a41aedd5106245666d7261a5218ceac0fc
31+
image: registry.gitlab.com/finestructure/spi-base:1.2.2
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:224946a41aedd5106245666d7261a5218ceac0fc as build
21+
FROM registry.gitlab.com/finestructure/spi-base:1.2.2 as build
2222

2323
# Set up a build area
2424
WORKDIR /build
@@ -62,7 +62,7 @@ RUN [ -d /build/Resources ] && { mv /build/Resources ./Resources && chmod -R a-w
6262
# ================================
6363
# Run image
6464
# ================================
65-
FROM registry.gitlab.com/finestructure/spi-base:224946a41aedd5106245666d7261a5218ceac0fc
65+
FROM registry.gitlab.com/finestructure/spi-base:1.2.2
6666

6767
# NB sas 2022-09-23: We're not using a dedicated `vapor` user to run the executable, because it
6868
# 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:224946a41aedd5106245666d7261a5218ceac0fc swift test
241+
docker run --rm -v "$PWD":/host -w /host --add-host=host.docker.internal:host-gateway registry.gitlab.com/finestructure/spi-base:1.2.2 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
@@ -71,7 +71,7 @@ test-docker:
7171
@# run tests inside a docker container
7272
docker run --rm -v "$(PWD)":/host -w /host \
7373
--add-host=host.docker.internal:host-gateway \
74-
registry.gitlab.com/finestructure/spi-base:224946a41aedd5106245666d7261a5218ceac0fc \
74+
registry.gitlab.com/finestructure/spi-base:1.2.2 \
7575
make test
7676

7777
test-e2e: db-reset reconcile ingest analyze

0 commit comments

Comments
 (0)