Merge branch 'james/helm' of github.com:nycmeshnet/network-map into j…

…ames/helm
nycmeshnet · Sep 18, 2024 · aac3497 · aac3497
2 parents 7821dd2 + 020f499
commit aac3497
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/publish-and-deploy.yaml b/.github/workflows/publish-and-deploy.yaml
@@ -11,7 +11,7 @@ jobs:
   push_to_registry:
     name: Push Docker Image to Docker Hub
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/meshdb'
+    #if: github.ref == 'refs/heads/meshdb'
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
@@ -34,7 +34,8 @@ jobs:
           context: .
           file: ./Dockerfile
           push: true
-          tags: ${{ steps.meta.outputs.tags }}
+          tags: "willnilges/network-map:helm"
+          #tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 
   deploy_to_dev3:
@@ -51,4 +52,5 @@ jobs:
     with:
       environment: prod1
     secrets: inherit
-    if: github.ref == 'refs/heads/meshdb'
+    #if: github.ref == 'refs/heads/meshdb'
+    needs: deploy_to_dev3
diff --git a/infra/map/values.yaml b/infra/map/values.yaml
@@ -9,7 +9,7 @@ map_namespace: "map"
 map:
   image:
     repository: willnilges/network-map
-    tag: meshdb
+    tag: helm
     pullPolicy: Always
   port: 3000
 
@@ -34,4 +34,4 @@ nodeSelector: {}
 
 tolerations: []
 
-affinity: {}
+affinity: {}