From 8b9bc6b903b1810c60c027544a8010b717da1a47 Mon Sep 17 00:00:00 2001
From: Abhishek Dasgupta <abhishek.dasgupta@dtc.ox.ac.uk>
Date: Tue, 17 Sep 2024 17:49:32 +0100
Subject: [PATCH] ci: try docker/build-push-action

---
 .github/workflows/deploy.yml | 15 +++++++--------
 src/olm/__init__.py          |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 6c68fbe..f33efbb 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -26,11 +26,10 @@ jobs:
       id: login-ecr
       uses: aws-actions/amazon-ecr-login@v2
 
-    - name: Build, tag, and push image to Amazon ECR (latest)
-      env:
-        REGISTRY: ${{ steps.login-ecr.outputs.registry }}
-        REPO: olm
-        IMAGE_TAG: ${{ github.sha }}
-      run: |
-        docker build . -t $REGISTRY/$REPO:latest .
-        docker push $REGISTRY/$REPO:latest
+    - name: Build and push container image
+      uses: docker/build-push-action@v6
+      with:
+        context: .
+        push: true
+        file: Dockerfile
+        tags: ${{ steps.login-ecr.outputs.registry }}/olm:latest,${{ steps.login-ecr.outputs.registry }}/olm:{{ github.sha }}
diff --git a/src/olm/__init__.py b/src/olm/__init__.py
index dab99be..f98c9c2 100644
--- a/src/olm/__init__.py
+++ b/src/olm/__init__.py
@@ -21,8 +21,8 @@
 olm is organised into subcommands:
 
   [get]         saves linelist data to disk
-  [list]        lists G.h outbreaks that olm supports
   [lint]        lints (checks) an outbreak linelist for errors
+  [list]        lists G.h outbreaks that olm supports
   [report]      generates briefing report for an outbreak
 """