change

Author: marcoacierno

.github/workflows/build-backend.yml

@@ -17,12 +17,6 @@ jobs:
         with:
           ref: ${{ github.ref }}
           fetch-depth: 0
-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-          aws-access-key-id: ${{ secrets.aws_access_key_id }}
-          aws-secret-access-key: ${{ secrets.aws_secret_access_key }}
-          aws-region: eu-central-1
       - name: Set up QEMU dependency
         uses: docker/setup-qemu-action@v3
       - name: Log in to the Container registry

.github/workflows/build-pretix.yml

@@ -14,14 +14,12 @@ jobs:
         with:
           ref: ${{ github.ref }}
           fetch-depth: 0
-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v4
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
         with:
-          aws-access-key-id: ${{ secrets.aws_access_key_id }}
-          aws-secret-access-key: ${{ secrets.aws_secret_access_key }}
-          aws-region: eu-central-1
-      - name: Login to Amazon ECR
-        uses: aws-actions/amazon-ecr-login@v2
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v3
@@ -33,7 +31,7 @@ jobs:
           builder: ${{ steps.buildx.outputs.name }}
           provenance: false
           push: true
-          tags: ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.eu-central-1.amazonaws.com/pythonit/pretix:arm-${{ inputs.githash }}
+          tags: ghcr.io/pythonitalia/pycon/pretix:${{ inputs.githash }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
           platforms: linux/arm64

infrastructure/applications/pretix/main.tf

@@ -8,7 +8,7 @@ resource "aws_ecs_task_definition" "pretix" {
   container_definitions = jsonencode([
     {
       name              = "pretix"
-      image             = "${data.aws_ecr_repository.repo.repository_url}@${data.aws_ecr_image.image.image_digest}"
+      image             = "ghcr.io/pythonitalia/pycon/pretix:${data.external.githash.result.githash}"
       memoryReservation = local.is_prod ? 1500 : 10
       essential         = true
 

infrastructure/applications/pycon_backend/web_task.tf

@@ -4,7 +4,7 @@ resource "aws_ecs_task_definition" "web" {
   container_definitions = jsonencode([
     {
       name              = "web"
-      image             = "${data.aws_ecr_repository.be_repo.repository_url}@${data.aws_ecr_image.be_arm_image.image_digest}"
+      image             = local.image
       memoryReservation = local.is_prod ? 400 : 10
       essential         = true
       entrypoint = [

infrastructure/applications/pycon_backend/worker.tf

@@ -190,6 +190,7 @@ locals {
       value = module.common_secrets.value.sns_webhook_secret
     }
   ]
+  image = "ghcr.io/pythonitalia/pycon/backend:${data.external.githash.result.githash}"
 }
 
 resource "aws_iam_role" "ecs_service" {
@@ -215,7 +216,7 @@ resource "aws_ecs_task_definition" "worker" {
   container_definitions = jsonencode([
     {
       name              = "worker"
-      image             = "${data.aws_ecr_repository.be_repo.repository_url}@${data.aws_ecr_image.be_arm_image.image_digest}"
+      image             = local.image
       memoryReservation = local.is_prod ? 200 : 10
       essential         = true
       entrypoint = [
@@ -259,7 +260,7 @@ resource "aws_ecs_task_definition" "worker" {
     },
     {
       name              = "migrations"
-      image             = "${data.aws_ecr_repository.be_repo.repository_url}@${data.aws_ecr_image.be_arm_image.image_digest}"
+      image             = local.image
       memoryReservation = local.is_prod ? 200 : 10
       essential         = false
       entrypoint = [
@@ -313,7 +314,7 @@ resource "aws_ecs_task_definition" "beat" {
   container_definitions = jsonencode([
     {
       name              = "beat"
-      image             = "${data.aws_ecr_repository.be_repo.repository_url}@${data.aws_ecr_image.be_arm_image.image_digest}"
+      image             = local.image
       memoryReservation = local.is_prod ? 200 : 10
       essential         = true
       entrypoint = [

infrastructure/applications/pycon_frontend/task.tf

@@ -10,7 +10,7 @@ resource "aws_ecs_task_definition" "pycon_frontend" {
   container_definitions = jsonencode([
     {
       name              = "frontend"
-      image             = "${aws_ecr_repository.repo.repository_url}@${data.aws_ecr_image.image.image_digest}"
+      image             = "ghcr.io/pythonitalia/pycon/frontend:${data.external.githash.result.githash}"
       memoryReservation = local.is_prod ? 400 : 10
       essential         = true