From 27c31463019d113e9197d2615cedd9dadb949e83 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Wed, 18 Nov 2020 18:47:48 +0100 Subject: [PATCH 1/2] Test login against registries part 2 Signed-off-by: CrazyMax --- .github/workflows/ci.yml | 154 +++++++++++++++++------------------ .github/workflows/labels.yml | 4 +- .github/workflows/test.yml | 4 +- 3 files changed, 81 insertions(+), 81 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 888fefed..612878e0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2.3.2 + uses: actions/checkout@v2 - name: Login to DockerHub uses: ./ @@ -29,59 +29,59 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} -# ecr: -# runs-on: ${{ matrix.os }} -# strategy: -# fail-fast: false -# matrix: -# os: -# - ubuntu-20.04 -# - ubuntu-18.04 -# - ubuntu-16.04 -# steps: -# - -# name: Checkout -# uses: actions/checkout@v2.3.1 -# - -# name: Login to ECR -# uses: ./ -# with: -# registry: ${{ secrets.AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.AWS_REGION }}.amazonaws.com -# username: ${{ secrets.AWS_ACCESS_KEY_ID }} -# password: ${{ secrets.AWS_SECRET_ACCESS_KEY }} -# -# ecr-aws-creds: -# runs-on: ${{ matrix.os }} -# strategy: -# fail-fast: false -# matrix: -# os: -# - ubuntu-20.04 -# - ubuntu-18.04 -# - ubuntu-16.04 -# steps: -# - -# name: Checkout -# uses: actions/checkout@v2.3.1 -# - -# 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: ${{ secrets.AWS_REGION }} -# - -# name: Login to ECR -# uses: ./ -# with: -# registry: ${{ secrets.AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.AWS_REGION }}.amazonaws.com + ecr: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: + - ubuntu-20.04 + - ubuntu-18.04 + - ubuntu-16.04 + steps: + - + name: Checkout + uses: actions/checkout@v2 + - + name: Login to ECR + uses: ./ + with: + registry: ${{ secrets.AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.AWS_REGION }}.amazonaws.com + username: ${{ secrets.AWS_ACCESS_KEY_ID }} + password: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + + ecr-aws-creds: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: + - ubuntu-20.04 + - ubuntu-18.04 + - ubuntu-16.04 + steps: + - + name: Checkout + uses: actions/checkout@v2 + - + 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: ${{ secrets.AWS_REGION }} + - + name: Login to ECR + uses: ./ + with: + registry: ${{ secrets.AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.AWS_REGION }}.amazonaws.com github-package: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2.3.2 + uses: actions/checkout@v2 - name: Login to GitHub Package Registry uses: ./ @@ -95,7 +95,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2.3.2 + uses: actions/checkout@v2 - name: Login to GitHub Package Registry uses: ./ @@ -109,7 +109,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2.3.2 + uses: actions/checkout@v2 - name: Login to GitLab uses: ./ @@ -118,30 +118,30 @@ jobs: username: ${{ secrets.GITLAB_USERNAME }} password: ${{ secrets.GITLAB_TOKEN }} -# google-artifact: -# runs-on: ubuntu-latest -# steps: -# - -# name: Checkout -# uses: actions/checkout@v2.3.2 -# - -# name: Login to Google Artifact Registry -# uses: ./ -# with: -# registry: ${{ secrets.GAR_LOCATION }}-docker.pkg.dev -# username: _json_key -# password: ${{ secrets.GAR_JSON_KEY }} -# -# google-container: -# runs-on: ubuntu-latest -# steps: -# - -# name: Checkout -# uses: actions/checkout@v2.3.2 -# - -# name: Login to Google Container Registry -# uses: ./ -# with: -# registry: gcr.io -# username: _json_key -# password: ${{ secrets.GCR_JSON_KEY }} + google-artifact: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v2 + - + name: Login to Google Artifact Registry + uses: ./ + with: + registry: ${{ secrets.GAR_LOCATION }}-docker.pkg.dev + username: _json_key + password: ${{ secrets.GAR_JSON_KEY }} + + google-container: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v2 + - + name: Login to Google Container Registry + uses: ./ + with: + registry: gcr.io + username: _json_key + password: ${{ secrets.GCR_JSON_KEY }} diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index 7c63f322..29eb111d 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -14,7 +14,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2.3.2 + uses: actions/checkout@v2 - name: Run Labeler - uses: crazy-max/ghaction-github-labeler@v3.0.0 \ No newline at end of file + uses: crazy-max/ghaction-github-labeler@v3 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8ea27d39..e5a0cb18 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2.3.2 + uses: actions/checkout@v2 - name: Install run: yarn install @@ -33,7 +33,7 @@ jobs: run: yarn run test - name: Upload coverage - uses: codecov/codecov-action@v1.0.13 + uses: codecov/codecov-action@v1 if: success() with: token: ${{ secrets.CODECOV_TOKEN }} From c718c795e7793f38ffe86b8830109677e8028b1e Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Thu, 17 Dec 2020 11:06:17 +0100 Subject: [PATCH 2/2] Update for public ECR Signed-off-by: CrazyMax --- .github/workflows/ci.yml | 103 +++++++++++++++++++++++++++++---------- 1 file changed, 76 insertions(+), 27 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 612878e0..fcd0dabb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -76,72 +76,121 @@ jobs: with: registry: ${{ secrets.AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.AWS_REGION }}.amazonaws.com - github-package: - runs-on: ubuntu-latest + ecr-public: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: + - ubuntu-20.04 + - ubuntu-18.04 + - ubuntu-16.04 steps: - name: Checkout uses: actions/checkout@v2 - - name: Login to GitHub Package Registry + name: Login to Public ECR uses: ./ with: - registry: docker.pkg.github.com - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} + registry: public.ecr.aws + username: ${{ secrets.AWS_ACCESS_KEY_ID }} + password: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + env: + AWS_REGION: ${{ secrets.AWS_REGION }} - github-container: - runs-on: ubuntu-latest + ecr-public-aws-creds: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: + - ubuntu-20.04 + - ubuntu-18.04 + - ubuntu-16.04 steps: - name: Checkout uses: actions/checkout@v2 - - name: Login to GitHub Package Registry + 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: ${{ secrets.AWS_REGION }} + - + name: Login to Public ECR uses: ./ with: - registry: ghcr.io - username: ${{ secrets.GHCR_USERNAME }} - password: ${{ secrets.GHCR_PAT }} + registry: public.ecr.aws - gitlab: + github-package: runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v2 - - name: Login to GitLab + name: Login to GitHub Package Registry uses: ./ with: - registry: registry.gitlab.com - username: ${{ secrets.GITLAB_USERNAME }} - password: ${{ secrets.GITLAB_TOKEN }} + registry: docker.pkg.github.com + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} - google-artifact: + github-container: runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v2 - - name: Login to Google Artifact Registry + name: Login to GitHub Package Registry uses: ./ with: - registry: ${{ secrets.GAR_LOCATION }}-docker.pkg.dev - username: _json_key - password: ${{ secrets.GAR_JSON_KEY }} + registry: ghcr.io + username: ${{ secrets.GHCR_USERNAME }} + password: ${{ secrets.GHCR_PAT }} - google-container: + gitlab: runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v2 - - name: Login to Google Container Registry + name: Login to GitLab uses: ./ with: - registry: gcr.io - username: _json_key - password: ${{ secrets.GCR_JSON_KEY }} + registry: registry.gitlab.com + username: ${{ secrets.GITLAB_USERNAME }} + password: ${{ secrets.GITLAB_TOKEN }} + +# google-artifact: +# runs-on: ubuntu-latest +# steps: +# - +# name: Checkout +# uses: actions/checkout@v2 +# - +# name: Login to Google Artifact Registry +# uses: ./ +# with: +# registry: ${{ secrets.GAR_LOCATION }}-docker.pkg.dev +# username: _json_key +# password: ${{ secrets.GAR_JSON_KEY }} +# +# google-container: +# runs-on: ubuntu-latest +# steps: +# - +# name: Checkout +# uses: actions/checkout@v2 +# - +# name: Login to Google Container Registry +# uses: ./ +# with: +# registry: gcr.io +# username: _json_key +# password: ${{ secrets.GCR_JSON_KEY }}