diff --git a/.github/workflows/contrib_rerun_py.yml b/.github/workflows/contrib_rerun_py.yml index dcb816c4e407..41eb5a937df7 100644 --- a/.github/workflows/contrib_rerun_py.yml +++ b/.github/workflows/contrib_rerun_py.yml @@ -47,7 +47,7 @@ jobs: name: Build Wheels runs-on: ubuntu-latest-16-cores container: - image: rerunio/ci_docker:0.14.0 + image: rerunio/ci_docker:0.15.0 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/reusable_build_and_upload_rerun_c.yml b/.github/workflows/reusable_build_and_upload_rerun_c.yml index 18564deb05cd..d52bf18a679e 100644 --- a/.github/workflows/reusable_build_and_upload_rerun_c.yml +++ b/.github/workflows/reusable_build_and_upload_rerun_c.yml @@ -89,13 +89,13 @@ jobs: linux-arm64) runner="buildjet-8vcpu-ubuntu-2204-arm" target="aarch64-unknown-linux-gnu" - container="'rerunio/ci_docker:0.14.0'" + container="'rerunio/ci_docker:0.15.0'" lib_name="librerun_c.a" ;; linux-x64) runner="ubuntu-latest-16-cores" target="x86_64-unknown-linux-gnu" - container="'rerunio/ci_docker:0.14.0'" + container="'rerunio/ci_docker:0.15.0'" lib_name="librerun_c.a" ;; windows-x64) diff --git a/.github/workflows/reusable_build_and_upload_rerun_cli.yml b/.github/workflows/reusable_build_and_upload_rerun_cli.yml index 711e52fe5730..3c9fead6ea29 100644 --- a/.github/workflows/reusable_build_and_upload_rerun_cli.yml +++ b/.github/workflows/reusable_build_and_upload_rerun_cli.yml @@ -90,13 +90,13 @@ jobs: linux-arm64) runner="buildjet-8vcpu-ubuntu-2204-arm" target="aarch64-unknown-linux-gnu" - container="'rerunio/ci_docker:0.14.0'" + container="'rerunio/ci_docker:0.15.0'" bin_name="rerun" ;; linux-x64) runner="ubuntu-latest-16-cores" target="x86_64-unknown-linux-gnu" - container="'rerunio/ci_docker:0.14.0'" + container="'rerunio/ci_docker:0.15.0'" bin_name="rerun" ;; windows-x64) diff --git a/.github/workflows/reusable_build_and_upload_wheels.yml b/.github/workflows/reusable_build_and_upload_wheels.yml index a90528d066d6..b527b0c661e0 100644 --- a/.github/workflows/reusable_build_and_upload_wheels.yml +++ b/.github/workflows/reusable_build_and_upload_wheels.yml @@ -113,14 +113,14 @@ jobs: linux-arm64) runner="buildjet-8vcpu-ubuntu-2204-arm" target="aarch64-unknown-linux-gnu" - container="'rerunio/ci_docker:0.14.0'" # Required to be manylinux compatible + container="'rerunio/ci_docker:0.15.0'" # Required to be manylinux compatible compat="manylinux_2_31" ;; linux-x64) runner="ubuntu-latest-16-cores" target="x86_64-unknown-linux-gnu" compat="manylinux_2_31" - container="'rerunio/ci_docker:0.14.0'" # Required to be manylinux compatible + container="'rerunio/ci_docker:0.15.0'" # Required to be manylinux compatible ;; windows-x64) runner="windows-latest-8-cores" diff --git a/.github/workflows/reusable_bundle_and_upload_rerun_cpp.yml b/.github/workflows/reusable_bundle_and_upload_rerun_cpp.yml index a6f4f10ded45..241326f2bb62 100644 --- a/.github/workflows/reusable_bundle_and_upload_rerun_cpp.yml +++ b/.github/workflows/reusable_bundle_and_upload_rerun_cpp.yml @@ -31,7 +31,7 @@ jobs: name: Bundle and upload rerun_cpp_sdk.zip runs-on: ubuntu-latest container: - image: rerunio/ci_docker:0.14.0 # Need container for arrow dependency. + image: rerunio/ci_docker:0.15.0 # Need container for arrow dependency. steps: - name: Checkout repository uses: actions/checkout@v4 diff --git a/.github/workflows/reusable_run_notebook.yml b/.github/workflows/reusable_run_notebook.yml index 57634dd3222c..75bd908ba82e 100644 --- a/.github/workflows/reusable_run_notebook.yml +++ b/.github/workflows/reusable_run_notebook.yml @@ -28,7 +28,7 @@ jobs: name: Run notebook 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). container: - 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` + 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` steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/reusable_test_wheels.yml b/.github/workflows/reusable_test_wheels.yml index 2400339524ec..0c6789e44428 100644 --- a/.github/workflows/reusable_test_wheels.yml +++ b/.github/workflows/reusable_test_wheels.yml @@ -79,12 +79,12 @@ jobs: linux-arm64) runner="buildjet-8vcpu-ubuntu-2204-arm" target="aarch64-unknown-linux-gnu" - container="'rerunio/ci_docker:0.14.0'" + container="'rerunio/ci_docker:0.15.0'" ;; linux-x64) runner="ubuntu-latest-16-cores" target="x86_64-unknown-linux-gnu" - container="'rerunio/ci_docker:0.14.0'" + container="'rerunio/ci_docker:0.15.0'" ;; windows-x64) runner="windows-latest-8-cores" diff --git a/ci_docker/Dockerfile b/ci_docker/Dockerfile index d2739e562bdb..a9651f86f370 100644 --- a/ci_docker/Dockerfile +++ b/ci_docker/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:20.04 LABEL maintainer="opensource@rerun.io" # Remember to update the version in publish.sh # TODO(jleibs) use this version in the publish.sh script and below in the CACHE_KEY -LABEL version="0.14.0" +LABEL version="0.15.0" LABEL description="Docker image used for the CI of https://github.com/rerun-io/rerun" # Install the ubuntu package dependencies @@ -21,6 +21,7 @@ RUN set -eux; \ cmake \ curl \ git \ + git-lfs \ libatk-bridge2.0 \ libfontconfig1-dev \ libfreetype6-dev \ @@ -45,7 +46,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y # Increment this to invalidate cache -ENV CACHE_KEY=rerun_docker_v0.14.0 +ENV CACHE_KEY=rerun_docker_v0.15.0 # See: https://github.com/actions/runner-images/issues/6775#issuecomment-1410270956 RUN git config --system --add safe.directory '*' diff --git a/ci_docker/README.md b/ci_docker/README.md new file mode 100644 index 000000000000..4d46788b41ac --- /dev/null +++ b/ci_docker/README.md @@ -0,0 +1,7 @@ +If you see this error while trying to publish: +> 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 + +It means your docker cache is corrupt. Fix it by pruning the cache: +```sh +docker system prune -af +``` diff --git a/ci_docker/publish.sh b/ci_docker/publish.sh index 25f7fe1dc348..f79cfe001229 100755 --- a/ci_docker/publish.sh +++ b/ci_docker/publish.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -eux -VERSION=0.14.0 # Bump on each new version. Remember to update the version in the Dockerfile too. +VERSION=0.15.0 # Bump on each new version. Remember to update the version in the Dockerfile too. # The build needs to run from top of repo to access the requirements.txt cd `git rev-parse --show-toplevel`