From 4d71f3f350eb555f21025c9591039ff42410cc6f Mon Sep 17 00:00:00 2001
From: Michael Migliore <mcmigliore@gmail.com>
Date: Thu, 30 Jan 2025 08:56:41 +0100
Subject: [PATCH] gh

---
 .github/workflows/build_docker_image.yml | 18 +++++++++---------
 android/Dockerfile                       |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build_docker_image.yml b/.github/workflows/build_docker_image.yml
index 675d640..6757c84 100644
--- a/.github/workflows/build_docker_image.yml
+++ b/.github/workflows/build_docker_image.yml
@@ -28,7 +28,7 @@ jobs:
       uses: docker/build-push-action@v6
       with:
         push: ${{ github.ref == 'refs/heads/main' }}
-        tags: f3d-app/f3d-ci:latest
+        tags: ghcr.io/f3d-app/f3d-ci:latest
         context: "{{defaultContext}}:ci"
 
   build_f3d-wasm:
@@ -49,7 +49,7 @@ jobs:
       uses: docker/build-push-action@v6
       with:
         push: ${{ github.ref == 'refs/heads/main' }}
-        tags: f3d-app/f3d-wasm:${{ env.VTK_SHA }}
+        tags: ghcr.io/f3d-app/f3d-wasm:${{ env.VTK_SHA }}
         context: "{{defaultContext}}:webassembly"
         build-args: |
           CMAKE_BUILD_PARALLEL_LEVEL=4
@@ -57,8 +57,8 @@ jobs:
           DRACO_VERSION=1.5.7
           OCCT_VERSION=V7_8_1
           VTK_VERSION=${{ env.VTK_SHA }}
-        cache-from: type=registry,ref=f3d-app/f3d-wasm-${{ env.VTK_SHA }}:buildcache
-        cache-to: type=registry,ref=f3d-app/f3d-wasm-${{ env.VTK_SHA }}:buildcache,mode=max,compression=zstd
+        cache-from: type=registry,ref=ghcr.io/f3d-app/f3d-wasm-${{ env.VTK_SHA }}:buildcache
+        cache-to: type=registry,ref=ghcr.io/f3d-app/f3d-wasm-${{ env.VTK_SHA }}:buildcache,mode=max,compression=zstd
 
   build_f3d-android:
     strategy:
@@ -83,7 +83,7 @@ jobs:
       uses: docker/build-push-action@v6
       with:
         push: ${{ github.ref == 'refs/heads/main' }}
-        tags: f3d-app/f3d-android-${{ matrix.arch }}:${{ env.VTK_SHA }}
+        tags: ghcr.io/f3d-app/f3d-android-${{ matrix.arch }}:${{ env.VTK_SHA }}
         context: "{{defaultContext}}:android"
         build-args: |
           ANDROID_API=34
@@ -96,8 +96,8 @@ jobs:
           IMATH_VERSION=v3.1.12
           OCCT_VERSION=V7_8_1
           VTK_VERSION=${{ env.VTK_SHA }}
-        cache-from: type=registry,ref=f3d-app/f3d-android-${{ matrix.arch }}-${{ env.VTK_SHA }}:buildcache
-        cache-to: type=registry,ref=f3d-app/f3d-android-${{ matrix.arch }}-${{ env.VTK_SHA }}:buildcache,mode=max,compression=zstd
+        cache-from: type=registry,ref=ghcr.io/f3d-app/f3d-android-${{ matrix.arch }}-${{ env.VTK_SHA }}:buildcache
+        cache-to: type=registry,ref=ghcr.io/f3d-app/f3d-android-${{ matrix.arch }}-${{ env.VTK_SHA }}:buildcache,mode=max,compression=zstd
 
   build_f3d-superbuild-ci:
     runs-on: ubuntu-latest
@@ -114,7 +114,7 @@ jobs:
       uses: docker/build-push-action@v6
       with:
         push: ${{ github.ref == 'refs/heads/main' }}
-        tags: f3d-app/f3d-superbuild-ci:latest
+        tags: ghcr.io/f3d-app/f3d-superbuild-ci:latest
         context: "{{defaultContext}}:superbuild"
 
   build_f3d-wheels-manylinux-ci:
@@ -133,5 +133,5 @@ jobs:
       uses: docker/build-push-action@v6
       with:
         push: ${{ github.ref == 'refs/heads/main' }}
-        tags: f3d-app/f3d-wheels-manylinux-ci:latest
+        tags: ghcr.io/f3d-app/f3d-wheels-manylinux-ci:latest
         context: "{{defaultContext}}:wheels-manylinux"
diff --git a/android/Dockerfile b/android/Dockerfile
index 12f9c21..3146b2b 100644
--- a/android/Dockerfile
+++ b/android/Dockerfile
@@ -191,7 +191,7 @@ RUN cmake --build /vtk-build && rm -rf /vtk-src
 ######################################
 FROM base
 
-ENV CMAKE_TOOLCHAIN_FILE /android-toolchain.cmake
+ENV CMAKE_TOOLCHAIN_FILE=/android-toolchain.cmake
 
 COPY --from=alembic /depends /depends
 COPY --from=assimp /depends /depends