uncomment sections waiting on #8

neondatabase · Jan 11, 2023 · 5bc9f34 · 5bc9f34
1 parent f6838ee
commit 5bc9f34
Showing 1 changed file with 21 additions and 23 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -7,8 +7,7 @@ on:
 env:
   AGENT_IMAGE: "neondatabase/autoscaler-agent"
   SCHED_IMAGE: "neondatabase/autoscale-scheduler"
-  # pending merge of #8:
-  # INFORMANT_IMAGE: "neondatabase/vm-informant"
+  INFORMANT_IMAGE: "neondatabase/vm-informant"
 
 jobs:
   release:
@@ -59,27 +58,26 @@ jobs:
           tags: ${{ env.SCHED_IMAGE }}:${{ steps.get_vcs_info.outputs.version }}
           build-args:
             - GIT_INFO=${{ setps.get_vcs_info.outputs.git_info }}
-      # pending merge of #8:
-      # - name: build and push vm-informant image
-      #   uses: docker/build-push-action@v3
-      #   with:
-      #     context: .
-      #     push: true
-      #     file: build/vm-informant/Dockerfile
-      #     tags: ${{ env.INFORMANT_IMAGE }}:${{ steps.get_vcs_info.outputs.version }}
-      #     build-args:
-      #       - GIT_INFO=${{ setps.get_vcs_info.outputs.git_info }}
-      #
-      # # Because we want a docker image for the VM informant, the easiest way for us to also provide
-      # # a binary is by just extracting it from the container image itself.
-      # - name: extract vm-informant binary
-      #   run: |
-      #     mkdir bin
-      #     # todo: do we actually need to pull here if we're pushing above?
-      #     docker pull --quiet ${{ env.INFORMANT_IMAGE }}:${{ steps.get_vcs_info.outputs.version }}
-      #     ID=$(docker create ${{ env.INFORMANT_IMAGE }}:${{ steps.get_vcs_info.outputs.version }}
-      #     docker cp $ID:/usr/bin/vm-informant bin/vm-informant
-      #     docker rm -f $ID
+      - name: build and push vm-informant image
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          push: true
+          file: build/vm-informant/Dockerfile
+          tags: ${{ env.INFORMANT_IMAGE }}:${{ steps.get_vcs_info.outputs.version }}
+          build-args:
+            - GIT_INFO=${{ setps.get_vcs_info.outputs.git_info }}
+
+      # Because we want a docker image for the VM informant, the easiest way for us to also provide
+      # a binary is by just extracting it from the container image itself.
+      - name: extract vm-informant binary
+        run: |
+          mkdir bin
+          # todo: do we actually need to pull here if we're pushing above?
+          docker pull --quiet ${{ env.INFORMANT_IMAGE }}:${{ steps.get_vcs_info.outputs.version }}
+          ID=$(docker create ${{ env.INFORMANT_IMAGE }}:${{ steps.get_vcs_info.outputs.version }}
+          docker cp $ID:/usr/bin/vm-informant bin/vm-informant
+          docker rm -f $ID
 
       - name: github release
         uses: softprops/action-gh-release@v1