Publish docker image to AWS ECR (#11)

Author: GianlucaFicarelli

.github/workflows/main-branch-workflow.yml

@@ -6,18 +6,26 @@ on:
       - '[0-9]+.[0-9]+.[0-9]+'
 
 jobs:
-  publish-to-docker-hub:
+  publish-to-aws-ecr:
     runs-on: ubuntu-latest
     env:
       ENVIRONMENT: prod
-      IMAGE_NAME: bluebrain/obp-accounting-service
+      IMAGE_NAME: ${{ vars.PUBLICECR_URI }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.PUBLICECR_UPLOAD_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.PUBLICECR_UPLOAD_SECRET_ACCESS_KEY }}
+          aws-region: ${{ vars.PUBLICECR_REGION }}
+
+      - name: Authenticate with AWS Public ECR
+        uses: aws-actions/amazon-ecr-login@v2
         with:
-          username: ${{ vars.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Build and publish the Docker image to DockerHub
+          registry-type: public
+
+      - name: Build and publish the Docker image to AWS ECR
         run: make publish

.github/workflows/publish.yml

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.9
-ARG UV_VERSION=0.4.20
+ARG UV_VERSION=0.6
 ARG PYTHON_VERSION=3.12
 ARG PYTHON_BASE=${PYTHON_VERSION}-slim
 

Dockerfile

@@ -5,7 +5,12 @@ export APP_NAME := accounting-service
 export APP_VERSION := $(shell git describe --abbrev --dirty --always --tags)
 export COMMIT_SHA := $(shell git rev-parse HEAD)
 export IMAGE_NAME ?= $(APP_NAME)
-export IMAGE_TAG ?= $(APP_VERSION)-$(ENVIRONMENT)
+export IMAGE_TAG := $(APP_VERSION)
+export IMAGE_TAG_ALIAS := latest
+ifneq ($(ENVIRONMENT), prod)
+	export IMAGE_TAG := $(IMAGE_TAG)-$(ENVIRONMENT)
+	export IMAGE_TAG_ALIAS := $(IMAGE_TAG_ALIAS)-$(ENVIRONMENT)
+endif
 
 help:  ## Show this help
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-23s\033[0m %s\n", $$1, $$2}'

Makefile

@@ -9,6 +9,8 @@ services:
       - APP_NAME
       - APP_VERSION
       - COMMIT_SHA
+      tags:
+      - "${IMAGE_NAME}:${IMAGE_TAG_ALIAS}"
     ports:
     - "127.0.0.1:8100:8000"
     environment:
@@ -51,7 +53,7 @@ services:
     ports:
     - "127.0.0.1:5433:5432"
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U accounting_service"]
+      test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER"]
       interval: 10s
       timeout: 5s
       retries: 3

docker-compose.run.yml

@@ -31,7 +31,7 @@ services:
     ports:
     - "127.0.0.1:5434:5432"
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U accounting_service"]
+      test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER"]
       interval: 10s
       timeout: 5s
       retries: 3