Skip to content

Commit b356f90

Browse files
authored
Add git-lfs to our CI container (#8946)
Title. * See it in action in #8936.
1 parent 4ddfc81 commit b356f90

10 files changed

+22
-14
lines changed

.github/workflows/contrib_rerun_py.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
name: Build Wheels
4848
runs-on: ubuntu-latest-16-cores
4949
container:
50-
image: rerunio/ci_docker:0.14.0
50+
image: rerunio/ci_docker:0.15.0
5151
steps:
5252
- uses: actions/checkout@v4
5353

.github/workflows/reusable_build_and_upload_rerun_c.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,13 @@ jobs:
8989
linux-arm64)
9090
runner="buildjet-8vcpu-ubuntu-2204-arm"
9191
target="aarch64-unknown-linux-gnu"
92-
container="'rerunio/ci_docker:0.14.0'"
92+
container="'rerunio/ci_docker:0.15.0'"
9393
lib_name="librerun_c.a"
9494
;;
9595
linux-x64)
9696
runner="ubuntu-latest-16-cores"
9797
target="x86_64-unknown-linux-gnu"
98-
container="'rerunio/ci_docker:0.14.0'"
98+
container="'rerunio/ci_docker:0.15.0'"
9999
lib_name="librerun_c.a"
100100
;;
101101
windows-x64)

.github/workflows/reusable_build_and_upload_rerun_cli.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,13 @@ jobs:
9090
linux-arm64)
9191
runner="buildjet-8vcpu-ubuntu-2204-arm"
9292
target="aarch64-unknown-linux-gnu"
93-
container="'rerunio/ci_docker:0.14.0'"
93+
container="'rerunio/ci_docker:0.15.0'"
9494
bin_name="rerun"
9595
;;
9696
linux-x64)
9797
runner="ubuntu-latest-16-cores"
9898
target="x86_64-unknown-linux-gnu"
99-
container="'rerunio/ci_docker:0.14.0'"
99+
container="'rerunio/ci_docker:0.15.0'"
100100
bin_name="rerun"
101101
;;
102102
windows-x64)

.github/workflows/reusable_build_and_upload_wheels.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,14 @@ jobs:
113113
linux-arm64)
114114
runner="buildjet-8vcpu-ubuntu-2204-arm"
115115
target="aarch64-unknown-linux-gnu"
116-
container="'rerunio/ci_docker:0.14.0'" # Required to be manylinux compatible
116+
container="'rerunio/ci_docker:0.15.0'" # Required to be manylinux compatible
117117
compat="manylinux_2_31"
118118
;;
119119
linux-x64)
120120
runner="ubuntu-latest-16-cores"
121121
target="x86_64-unknown-linux-gnu"
122122
compat="manylinux_2_31"
123-
container="'rerunio/ci_docker:0.14.0'" # Required to be manylinux compatible
123+
container="'rerunio/ci_docker:0.15.0'" # Required to be manylinux compatible
124124
;;
125125
windows-x64)
126126
runner="windows-latest-8-cores"

.github/workflows/reusable_bundle_and_upload_rerun_cpp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
name: Bundle and upload rerun_cpp_sdk.zip
3232
runs-on: ubuntu-latest
3333
container:
34-
image: rerunio/ci_docker:0.14.0 # Need container for arrow dependency.
34+
image: rerunio/ci_docker:0.15.0 # Need container for arrow dependency.
3535
steps:
3636
- name: Checkout repository
3737
uses: actions/checkout@v4

.github/workflows/reusable_run_notebook.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
name: Run notebook
2929
runs-on: ubuntu-latest-16-cores # Note that as of writing we need the additional storage page (14 gb of the ubunut-latest runner is not enough).
3030
container:
31-
image: rerunio/ci_docker:0.14.0 # Required to run the wheel or we get "No matching distribution found for attrs>=23.1.0" during `pip install rerun-sdk`
31+
image: rerunio/ci_docker:0.15.0 # Required to run the wheel or we get "No matching distribution found for attrs>=23.1.0" during `pip install rerun-sdk`
3232
steps:
3333
- uses: actions/checkout@v4
3434
with:

.github/workflows/reusable_test_wheels.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ jobs:
7979
linux-arm64)
8080
runner="buildjet-8vcpu-ubuntu-2204-arm"
8181
target="aarch64-unknown-linux-gnu"
82-
container="'rerunio/ci_docker:0.14.0'"
82+
container="'rerunio/ci_docker:0.15.0'"
8383
;;
8484
linux-x64)
8585
runner="ubuntu-latest-16-cores"
8686
target="x86_64-unknown-linux-gnu"
87-
container="'rerunio/ci_docker:0.14.0'"
87+
container="'rerunio/ci_docker:0.15.0'"
8888
;;
8989
windows-x64)
9090
runner="windows-latest-8-cores"

ci_docker/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM ubuntu:20.04
22
LABEL maintainer="[email protected]"
33
# Remember to update the version in publish.sh
44
# TODO(jleibs) use this version in the publish.sh script and below in the CACHE_KEY
5-
LABEL version="0.14.0"
5+
LABEL version="0.15.0"
66
LABEL description="Docker image used for the CI of https://github.com/rerun-io/rerun"
77

88
# Install the ubuntu package dependencies
@@ -21,6 +21,7 @@ RUN set -eux; \
2121
cmake \
2222
curl \
2323
git \
24+
git-lfs \
2425
libatk-bridge2.0 \
2526
libfontconfig1-dev \
2627
libfreetype6-dev \
@@ -45,7 +46,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
4546
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
4647

4748
# Increment this to invalidate cache
48-
ENV CACHE_KEY=rerun_docker_v0.14.0
49+
ENV CACHE_KEY=rerun_docker_v0.15.0
4950

5051
# See: https://github.com/actions/runner-images/issues/6775#issuecomment-1410270956
5152
RUN git config --system --add safe.directory '*'

ci_docker/README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
If you see this error while trying to publish:
2+
> ERROR: failed to solve: failed to compute cache key: failed to rename: rename /var/lib/containerd/io.containerd.snapshotter.v1.overlayfs/snapshots/new-3352706846 /var/lib/containerd/io.containerd.snapshotter.v1.overlayfs/snapshots/33: file exists: unknown
3+
4+
It means your docker cache is corrupt. Fix it by pruning the cache:
5+
```sh
6+
docker system prune -af
7+
```

ci_docker/publish.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22
set -eux
33

4-
VERSION=0.14.0 # Bump on each new version. Remember to update the version in the Dockerfile too.
4+
VERSION=0.15.0 # Bump on each new version. Remember to update the version in the Dockerfile too.
55

66
# The build needs to run from top of repo to access the requirements.txt
77
cd `git rev-parse --show-toplevel`

0 commit comments

Comments
 (0)