Merge pull request #45 from Moros1138/fix-workflows

complete redo of the docker builder functions
Moros1138 · May 2, 2024 · 5701320 · 5701320
2 parents 085aee1 + f5f39df
commit 5701320
Showing 1 changed file with 14 additions and 21 deletions.
diff --git a/.github/workflows/test-on-push-main.yml b/.github/workflows/test-on-push-main.yml
@@ -50,24 +50,17 @@ jobs:
       - name: Execute Browser Tests
         run: php artisan dusk
 
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      -
-        name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          push: true
-          tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/pgetinker:${{ steps.vars.outputs.sha }}
-            ${{ secrets.DOCKERHUB_USERNAME }}/pgetinker:latest
-            
+      - name: Login to DockerHub
+        run: docker login --username ${{ secrets.DOCKERHUB_USERNAME }} --password ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build Docker Image
+        run: docker buildx build -t ${{ secrets.DOCKERHUB_USERNAME }}/pgetinker:${{ steps.vars.outputs.sha }} -t ${{ secrets.DOCKERHUB_USERNAME }}/pgetinker:latest .
+
+      - name: Push Docker Image
+        run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/pgetinker:latest -a
+
+      - name: Clean up Docker
+        run: docker image rm ${{ secrets.DOCKERHUB_USERNAME }}/pgetinker:latest
+
+      - name: Logout of DockerHub
+        run: docker logout