build-docker.yml: Reenable build jobfeature/cicd-docker-integration-tests

Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>

1 files changed, 31 insertions, 31 deletions

diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index fe1a84fe..f47ab875 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -12,39 +12,39 @@ on:
       - 'v*'
 
 jobs:
-#  build:
-#    runs-on: ubuntu-latest
-#    strategy:
-#      matrix:
-#        arch:
-#          - x86
-#          - armhf
-#          - arm64
-#      fail-fast: false
-#    steps:
-#      - name: Setup Docker Buildx
-#        uses: docker/setup-buildx-action@v1
-#
-#      - name: Set up QEMU
-#        uses: docker/setup-qemu-action@v1
-#
-#      - name: Checkout code
-#        uses: actions/checkout@v3
-#
-#      - name: Login to docker
-#        run: |
-#          echo "${{ secrets.DOCKER_PASSWORD_INTERNAL }}" | docker login -u "${{ secrets.DOCKER_LOGIN_INTERNAL }}" --password-stdin
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        arch:
+          - x86
+          - armhf
+          - arm64
+      fail-fast: false
+    steps:
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v1
 
-#      - name: Build images
-#        id: build-container
-#        run: |
-#          ./build/build-docker.sh "${{ matrix.arch }}"
-#          docker tag "ownyourbits/nextcloudpi-${{ matrix.arch }}:latest" "thecalcaholic/ncp-internal-${{ matrix.arch }}:${{ github.run_id }}"
-#          docker push "thecalcaholic/ncp-internal-${{ matrix.arch }}:${{ github.run_id }}"
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Login to docker
+        run: |
+          echo "${{ secrets.DOCKER_PASSWORD_INTERNAL }}" | docker login -u "${{ secrets.DOCKER_LOGIN_INTERNAL }}" --password-stdin
+
+      - name: Build images
+        id: build-container
+        run: |
+          ./build/build-docker.sh "${{ matrix.arch }}"
+          docker tag "ownyourbits/nextcloudpi-${{ matrix.arch }}:latest" "thecalcaholic/ncp-internal-${{ matrix.arch }}:${{ github.run_id }}"
+          docker push "thecalcaholic/ncp-internal-${{ matrix.arch }}:${{ github.run_id }}"
 
   test:
-#    needs:
-#      - build
+    needs:
+      - build
     runs-on: ubuntu-latest
 #    services:
 #      ncp:
@@ -74,7 +74,7 @@ jobs:
           echo "${{ secrets.DOCKER_PASSWORD_INTERNAL }}" | docker login -u "${{ secrets.DOCKER_LOGIN_INTERNAL }}" --password-stdin
       - name: Start ncp container
         run: |
-          docker run -d --rm -p 8443:443 -p 4443:4443 --name nextcloudpi thecalcaholic/ncp-internal-${{ matrix.arch }}:2214093163
+          docker run -d --rm -p 8443:443 -p 4443:4443 --name nextcloudpi thecalcaholic/ncp-internal-${{ matrix.arch }}:${{ github.run_id }}
 
       - name: Checkout code
         uses: actions/checkout@v3