contrib: switch to our Guix container instead of the bundled one

Author: kwvg

.github/workflows/guix-build.yml

@@ -17,10 +17,12 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
 
-      - name: Hash Dockerfile
+      - name: Commit variables
         id: dockerfile
         run: |
-          echo "::set-output name=hash::$(sha256sum ./contrib/guix/Dockerfile | cut -d ' ' -f1)"
+          echo "::set-output name=hash::$(sha256sum ./contrib/containers/guix/Dockerfile | cut -d ' ' -f1)"
+          echo "::set-output name=host_user_id::$(id -u)"
+          echo "::set-output name=host_group_id::$(id -g)"
 
       - name: Cache Docker layers
         uses: actions/cache@v2
@@ -33,25 +35,27 @@ jobs:
       - name: Build Docker image
         uses: docker/build-push-action@v2
         with:
-          context: .
-          file: ./contrib/guix/Dockerfile
+          context: ${{ github.workspace }}
+          build-args: |
+            USER_ID=${{ steps.dockerfile.outputs.host_user_id }}
+            GROUP_ID=${{ steps.dockerfile.outputs.host_group_id }}
+          build-contexts: |
+            docker_root=${{ github.workspace }}/contrib/containers/guix
+          file: ./contrib/containers/guix/Dockerfile
           load: true
-          tags: alpine-guix:latest
+          tags: guix_ubuntu:latest
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
 
       - name: Run Guix build
         run: |
-          export ADDITIONAL_GUIX_COMMON_FLAGS='--max-jobs=32' && \
-          mkdir -p depends/SDKs && \
-          mkdir -p /tmp/guix-store && \
-          curl -L https://bitcoincore.org/depends-sources/sdks/Xcode-12.1-12A7403-extracted-SDK-with-libcxx-headers.tar.gz | tar -xz -C depends/SDKs && \
-          docker run --privileged -d --name guix-daemon --rm -v ${{ github.workspace }}:/dash -w /dash alpine-guix:latest && \
-          docker exec guix-daemon bash -c "\
-          chmod 777 /dash/depends && \
-          git config --global --add safe.directory /dash && \
-          cd /dash && \
-          contrib/guix/guix-build"
+          docker run --privileged -d --rm -t \
+            --name guix-daemon \
+            -e ADDITIONAL_GUIX_COMMON_FLAGS='--max-jobs=32' \
+            -v ${{ github.workspace }}:/src/dash \
+            -w /src/dash \
+            guix_ubuntu:latest && \
+          docker exec guix-daemon bash -c "/usr/local/bin/guix-start"
 
       - name: Ensure build passes
         run: |