Simplified build

KomelT · Oct 29, 2024 · 5cd2372 · 5cd2372
1 parent b26c2bd
commit 5cd2372
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 50 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -13,20 +13,33 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Build APP
+      - name: Log in to DockerHub
+        if: github.ref == 'refs/heads/main'
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build and push APP Docker image
         uses: docker/build-push-action@v6
         with:
           context: "{{defaultContext}}"
           file: ./app/Dockerfile
+          push: ${{ github.ref == 'refs/heads/main' }}
+          tags: komelt/meshtastic-map:latest
 
-      - name: Build API
+      - name: Build and push API Docker image
         uses: docker/build-push-action@v6
         with:
           context: "{{defaultContext}}"
           file: ./api/Dockerfile
-
-      - name: Build MQTT
+          push: ${{ github.ref == 'refs/heads/main' }}
+          tags: komelt/meshtastic-map-api:latest
+
+      - name: Build and push MQTT Docker image
         uses: docker/build-push-action@v6
         with:
           context: "{{defaultContext}}"
           file: ./mqtt/Dockerfile
+          push: ${{ github.ref == 'refs/heads/main' }}
+          tags: komelt/meshtastic-map-mqtt:latest
diff --git a/.github/workflows/dockerhub-push.yaml b/.github/workflows/dockerhub-push.yaml