Merge branch 'topic/bbannier/publish-on-ecr'

* topic/bbannier/publish-on-ecr: Publish container images to ECR in addition to docker.io.
zeek · Nov 18, 2022 · 9c2b360 · 9c2b360
2 parents a065999 + a7e6325
commit 9c2b360
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -76,6 +76,16 @@ jobs:
             echo "::set-output name=tag::zeek:${RELEASE_VERSION}"
           fi
 
+      - name: Login to ECR
+        # Don't publish on forks. Also note that secrets for the login are not
+        # available for pull requests, so trigger on pushes only.
+        if: github.repository == 'zeek/zeek' && github.event_name == 'push'
+        uses: docker/login-action@v1
+        with:
+          registry: public.ecr.aws
+          username: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          password: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+
       - name: Login to DockerHub
         uses: docker/login-action@v2
         # Don't publish on forks. Also note that secrets for the login are not
@@ -96,7 +106,8 @@ jobs:
             CONFFLAGS=${{ env.CONFFLAGS }}
           push: true
           tags: |
-            zeekurity/${{ steps.target.outputs.tag }}
+            public.ecr.aws/zeekurity/${{ steps.target.outputs.tag }}
+            docker.io/zeekurity/${{ steps.target.outputs.tag }}
 
       - name: Preserve image artifact
         uses: actions/upload-artifact@v3

diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+5.2.0-dev.336 | 2022-11-17 16:28:40 -0800
+
+  * Publish container images to ECR in addition to docker.io. (Benjamin Bannier, Corelight)
+
 5.2.0-dev.334 | 2022-11-17 11:34:41 -0700
 
   * Make dependency of `zeek` on spicy-plugin's driver object file explicit. (Benjamin Bannier, Corelight)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.2.0-dev.334
+5.2.0-dev.336