Merge branch 'master' into aarushikansal/open-1646-ci-for-docker

.github/workflows/autogpt-builder-docker.yml

@@ -0,0 +1,41 @@
+name: AutoGPT Builder Docker
+
+on:
+  push:
+    branches: [ master ]
+    paths:
+      - 'rnd/autogpt_builder/**'
+
+defaults:
+  run:
+    shell: bash
+    working-directory: rnd/autogpt_builder
+
+env:
+  PROJECT_ID: agpt-dev
+  IMAGE_NAME: agpt-builder-dev
+  REGION: us-central1
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up Cloud SDK
+        uses: google-github-actions/setup-gcloud@v0.2.1
+        with:
+          project_id: ${{ env.PROJECT_ID }}
+          service_account_key: ${{ secrets.GCP_SA_KEY }}
+          export_default_credentials: true
+
+      - name: Configure Docker
+        run: gcloud auth configure-docker ${{ env.REGION }}-docker.pkg.dev
+
+      - name: Build Docker image
+        run: docker build -t ${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.IMAGE_NAME }}:${{ github.sha }} .
+
+      - name: Push Docker image
+        run: docker push ${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.IMAGE_NAME }}:${{ github.sha }}

.github/workflows/autogpt-server-docker.yml

@@ -0,0 +1,41 @@
+name: AutoGPT Server Docker
+
+on:
+  push:
+    branches: [ master ]
+    paths:
+      - 'rnd/autogpt_server/**'
+
+defaults:
+  run:
+    shell: bash
+    working-directory: rnd/autogpt_server
+
+env:
+  PROJECT_ID: agpt-dev
+  IMAGE_NAME: agpt-server-dev
+  REGION: us-central1
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up Cloud SDK
+        uses: google-github-actions/setup-gcloud@v0.2.1
+        with:
+          project_id: ${{ env.PROJECT_ID }}
+          service_account_key: ${{ secrets.GCP_SA_KEY }}
+          export_default_credentials: true
+
+      - name: Configure Docker
+        run: gcloud auth configure-docker ${{ env.REGION }}-docker.pkg.dev
+
+      - name: Build Docker image
+        run: docker build -t ${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.IMAGE_NAME }}:${{ github.sha }} .
+
+      - name: Push Docker image
+        run: docker push ${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.IMAGE_NAME }}:${{ github.sha }}

rnd/infra/terraform/environments/dev.tfvars

@@ -17,6 +17,10 @@ service_accounts = {
     display_name = "AutoGPT Dev Server Account"
     description  = "Service account for agpt dev server"
   },
+  "dev-agpt-gha-sa" = {
+    display_name = "GitHub Actions Service Account"
+    description  = "Service account for GitHub Actions"
+
   "dev-agpt-builder-sa" = {
     display_name = "AutoGPT Dev Builder Account"
     description  = "Service account for agpt dev builder"
@@ -89,6 +93,13 @@ role_bindings = {
     "serviceAccount:dev-agpt-market-sa@agpt-dev.iam.gserviceaccount.com"
   ],
   "roles/container.hostServiceAgentUser" = [
+    "serviceAccount:dev-agpt-server-sa@agpt-dev.iam.gserviceaccount.com"
+  ],
+  "roles/storage.admin" = [
+    "serviceAccount:dev-agpt-gha-sa@agpt-dev.iam.gserviceaccount.com"
+  ],
+  "roles/iam.serviceAccountUser" = [
+    "serviceAccount:dev-agpt-gha-sa@agpt-dev.iam.gserviceaccount.com"
     "serviceAccount:dev-agpt-server-sa@agpt-dev.iam.gserviceaccount.com",
     "serviceAccount:dev-agpt-builder-sa@agpt-dev.iam.gserviceaccount.com",
     "serviceAccount:dev-agpt-ws-server-sa@agpt-dev.iam.gserviceaccount.com",