Moved bluez to a separate image

chipp · Jun 27, 2024 · 6ffdffc · 6ffdffc
1 parent f964d3f
commit 6ffdffc
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 201 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -48,38 +48,3 @@ jobs:
              --label "org.opencontainers.image.source=https://github.com/${{ github.repository }}" \
              --cache-from=type=registry,ref=$IMAGE_ID:cache \
              --cache-to=type=registry,ref=$IMAGE_ID:cache,mode=max
-
-  test-isabel-libs:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        build_arch:
-          - arm64
-          - amd64
-        host_arch:
-          - arm64
-          - amd64
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Log into registry
-        run: echo ${{ secrets.CR_PAT }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@master
-
-      - name: Test
-        run: |
-          IMAGE_ID=ghcr.io/chipp/isabel
-          RUST_VERSION=$(cat .rust-version)
-          TEST_TAG=test-cache-libs-${{ matrix.build_arch }}-${{ matrix.host_arch }}
-
-          docker buildx build . --file bin/isabel/test_libs/${{ matrix.host_arch }}.Dockerfile \
-             --load \
-             --platform linux/${{ matrix.build_arch }} \
-             --build-arg RUST_VERSION="${RUST_VERSION}" \
-             --cache-from=type=registry,ref=$IMAGE_ID:$TEST_TAG \
-             --cache-to=type=registry,ref=$IMAGE_ID:$TEST_TAG,mode=max
diff --git a/.rust-version b/.rust-version
@@ -1 +1 @@
-1.79.0_1
+1.79.0_3
diff --git a/bin/isabel/Dockerfile b/bin/isabel/Dockerfile
@@ -1,11 +1,6 @@
 ARG RUST_VERSION
 
-FROM ghcr.io/chipp/build.rust.arm64_musl:${RUST_VERSION} AS libs_builder
-
-COPY ./bin/isabel/install_static_libs.sh ./install_static_libs.sh
-RUN chmod +x ./install_static_libs.sh && \
-  ./install_static_libs.sh && \
-  rm ./install_static_libs.sh
+FROM ghcr.io/chipp/bluez.static.arm64_musl:5.66_3 AS libs_builder
 
 FROM ghcr.io/chipp/build.rust.arm64_musl:${RUST_VERSION} AS builder
 

diff --git a/bin/isabel/install_static_libs.sh b/bin/isabel/install_static_libs.sh
diff --git a/bin/isabel/test.Dockerfile b/bin/isabel/test.Dockerfile
@@ -1,11 +1,6 @@
 ARG RUST_VERSION
 
-FROM ghcr.io/chipp/build.rust.x86_64_musl:${RUST_VERSION} AS libs_builder
-
-COPY ./bin/isabel/install_static_libs.sh ./install_static_libs.sh
-RUN chmod +x ./install_static_libs.sh && \
-  ./install_static_libs.sh && \
-  rm ./install_static_libs.sh
+FROM ghcr.io/chipp/bluez.static.x86_64_musl:5.66_3 AS libs_builder
 
 FROM ghcr.io/chipp/build.rust.x86_64_musl:${RUST_VERSION} AS builder
 

diff --git a/bin/isabel/test_libs/amd64.Dockerfile b/bin/isabel/test_libs/amd64.Dockerfile
diff --git a/bin/isabel/test_libs/arm64.Dockerfile b/bin/isabel/test_libs/arm64.Dockerfile