Merge pull request #58 from codeguru42/54-docker-hub

54 docker hub

Author: codeguru42

.github/workflows/build.yaml

@@ -13,45 +13,28 @@ jobs:
       - name: black
         uses: psf/black@stable
 
-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v1-node16
+      - name: Log in to Docker Hub
+        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
         with:
-          role-to-assume: arn:aws:iam::200049542062:role/go_capture/GithubRole
-          aws-region: us-west-1
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Set ECR Stack Name
-        id: ecr-stack-name
-        run: echo ECR_STACK_NAME=GoCaptureECR >> $GITHUB_OUTPUT
-
-      - name: Deploy ECR repository
-        uses: aws-actions/aws-cloudformation-github-deploy@v1
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
-          name: ${{ steps.ecr-stack-name.outputs.ECR_STACK_NAME }}
-          template: cloud-formation/ecr.yaml
-          no-fail-on-empty-changeset: 1
-
-      - name: Beta Deploy User
-        uses: aws-actions/aws-cloudformation-github-deploy@v1
+          images: codeguru42/go-capture
+          tags: |
+            type=raw,value=latest,enable={{is_default_branch}}
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=sha
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
         with:
-          name: GoCaptureBetaDeployUser
-          template: cloud-formation/beta-deploy-user.yaml
-          parameter-overrides: EcrStackName=${{ steps.ecr-stack-name.outputs.ECR_STACK_NAME }}
-          capabilities: CAPABILITY_NAMED_IAM
-          no-fail-on-empty-changeset: 1
-
-      - name: Login to Amazon ECR
-        id: login-ecr
-        uses: aws-actions/amazon-ecr-login@v1
-
-      - name: Build, tag, and push docker image to Amazon ECR
-        env:
-          BRANCH_NAME: ${{ github.ref_name }}
-          REGISTRY: ${{ steps.login-ecr.outputs.registry }}
-          REPOSITORY: go-capture
-          IMAGE_TAG: ${{ github.sha }}
-        run: |
-          docker build -t $REGISTRY/$REPOSITORY:$IMAGE_TAG .
-          if [ $BRANCH_NAME = main ]
-          then
-            docker push $REGISTRY/$REPOSITORY:$IMAGE_TAG
-          fi
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

docker-compose-prod.yml

@@ -1,14 +1,14 @@
 services:
   api:
-    image: ${account_id}.dkr.ecr.us-west-1.amazonaws.com/go-capture:${image_hash}
+    image: ${image}:${tag}
     env_file:
       - .env
     environment:
       - CELERY_BROKER_URL=amqp://guest:guest@broker:5672
     ports:
       - 8000:8000
   worker:
-    image: ${account_id}.dkr.ecr.us-west-1.amazonaws.com/go-capture:${image_hash}
+    image: ${image}:${tag}
     command: "poetry run celery -A go_capture.tasks worker"
     depends_on:
       - broker