commit

dabble-of-devops-bioanalyze · Jan 23, 2022 · 511e69a · 511e69a
1 parent 4e5b313
commit 511e69a
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 4 deletions.
diff --git a/.github/workflows/cellxgene-gateway-docker.yaml b/.github/workflows/cellxgene-gateway-docker.yaml
@@ -8,6 +8,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
 
       - name: Run changed-files
         id: changed-docker
@@ -42,4 +44,15 @@ jobs:
           build-args: |
             CELLXGENE_GATEWAY_VERSION=${{ steps.yq.outputs.result }}
           tags: |
-            dabbleofdevops/cellxgene-gateway:${{ steps.yq.outputs.result }},dabbleofdevops/cellxgene-gateway:${{env.SHA7}}
+            dabbleofdevops/cellxgene-gateway:${{ steps.yq.outputs.result }},dabbleofdevops/cellxgene-gateway:${{env.SHA7}}
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: us-east-1
+
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v1
diff --git a/.github/workflows/chart-releaser.yml b/.github/workflows/chart-releaser.yml
@@ -40,9 +40,11 @@ jobs:
           helm dep build
 
       # "arn:aws:ecr:us-east-1:018835827632:repository/shinyproxy"
-      # 018835827632.dkr.ecr.us-east-1.amazonaws.com/shinyproxy
       # "018835827632.dkr.ecr.us-east-1.amazonaws.com/helm-shinyproxy"
       # 018835827632.dkr.ecr.us-east-1.amazonaws.com/helm-cellxgene-gateway
+      # Helm chart name must be the same as the repo name
+      # 018835827632.dkr.ecr.us-east-1.amazonaws.com/cellxgene-gateway
+      # 018835827632.dkr.ecr.us-east-1.amazonaws.com/shinyproxy
       - name: Run chart-releaser
         uses: helm/chart-releaser-action@v1.2.1
         env:
@@ -52,4 +54,19 @@ jobs:
         run: |-
           ls -lah .cr-release-packages
 
+      # Helm chart name must be the same as the repo name
+      # 018835827632.dkr.ecr.us-east-1.amazonaws.com/cellxgene-gateway
+      # 018835827632.dkr.ecr.us-east-1.amazonaws.com/shinyproxy
+      - name: Upload to ECR
+        run: |-
+          export HELM_EXPERIMENTAL_OCI=1
+          find .cr-release-packages -name 'shinyproxy*.tgz' | xargs -I {} helm push {} oci://018835827632.dkr.ecr.us-east-1.amazonaws.com/
+          find .cr-release-packages -name 'cellxgene-gateway*.tgz' | xargs -I {} helm push {} oci://018835827632.dkr.ecr.us-east-1.amazonaws.com/
+
+          aws ecr describe-images \
+            --repository-name shinyproxy \
+            --region us-east-1
 
+          aws ecr describe-images \
+            --repository-name cellxgene-gateway \
+            --region us-east-1
diff --git a/.github/workflows/shinyproxy-docker.yaml b/.github/workflows/shinyproxy-docker.yaml
@@ -8,11 +8,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
       - name: Run changed-files
         id: changed-docker
         uses: tj-actions/changed-files@v13.1
         with:
-          path: images/cellxgene-gateway
+          path: images/shinyproxy
       - name: Set Job Environment Variables
         run: |-
           CALVER="$( date -u '+%Y.%m.%d' )"
@@ -37,3 +39,4 @@ jobs:
             SHINYPROXY_VERSION=${{ steps.yq.outputs.result }}
           tags: |
             dabbleofdevops/shinyproxy:${{ steps.yq.outputs.result }},dabbleofdevops/shinyproxy:${{env.SHA7}}
+
diff --git a/charts/cellxgene-gateway/Chart.yaml b/charts/cellxgene-gateway/Chart.yaml
@@ -27,4 +27,4 @@ sources:
   - https://github.com/Novartis/cellxgene-gateway
   - https://github.com/remche/zero-to-shinyproxy
   - https://www.shinyproxy.io/documentation
-version: 0.1.9
+version: 0.2.0