Merge pull request #718 from dhis2/DEVOPS-110

ci: remove extraneous .ebextensions dir and update EB env names
dhis2 · Jan 18, 2023 · fb49b89 · fb49b89
2 parents db4e643 + b4c5170
commit fb49b89
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 69 deletions.
diff --git a/.ebextensions/proxy.config b/.ebextensions/proxy.config
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -92,7 +92,7 @@ jobs:
 
                   sed -i "s|AUTOINJECTED_GH_ACTIONS|$ECR_REGISTRY/$ECR_REPOSITORY:$SHA_TAG|g" Dockerrun.aws.json
                   cat Dockerrun.aws.json
-                  zip -r deploy.zip .ebextensions Dockerrun.aws.json
+                  zip -r deploy.zip Dockerrun.aws.json
 
             - name: Deploy to Staging
               if: steps.build-image.outputs.version == 'staging'
@@ -101,7 +101,7 @@ jobs:
                   aws_access_key: ${{ secrets.AWS_ACCESS_KEY_ID }}
                   aws_secret_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
                   application_name: app-hub
-                  environment_name: staging
+                  environment_name: staging-v2
                   version_label: app-hub-staging-${{ github.run_id }}_${{ github.run_number}}
                   region: ${{ env.AWS_REGION }}
                   deployment_package: deploy.zip
@@ -113,7 +113,7 @@ jobs:
                   aws_access_key: ${{ secrets.AWS_ACCESS_KEY_ID }}
                   aws_secret_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
                   application_name: app-hub
-                  environment_name: prod
+                  environment_name: prod-v2
                   version_label: app-hub-prod-${{ github.run_id }}_${{ github.run_number}}
                   region: ${{ env.AWS_REGION }}
                   deployment_package: deploy.zip