Skip to content

Commit

Permalink
Merge branch 'viadee:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
cl-a-us authored Dec 11, 2024
2 parents a00a706 + da9f2ff commit 12b39c0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build_push_to_ecr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
uses: actions/checkout@v4

- name: Login to Public ECR
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: public.ecr.aws
username: ${{ secrets.AWS_PROD_ECR_VIADEE_ACCESS_KEY_ID }}
Expand All @@ -19,7 +19,7 @@ jobs:
AWS_REGION: us-east-1

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3

- name: Set up JDK 21
uses: actions/setup-java@v4
Expand All @@ -43,7 +43,7 @@ jobs:
type=semver,pattern={{major}}.{{minor}}
- name: Build and push Docker images
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
platforms: linux/amd64,linux/arm64
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/native_build_push_to_ecr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
uses: actions/checkout@v4

- name: Login to Public ECR
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: public.ecr.aws
username: ${{ secrets.AWS_PROD_ECR_VIADEE_ACCESS_KEY_ID }}
Expand All @@ -19,7 +19,7 @@ jobs:
AWS_REGION: us-east-1

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3

- name: Set up JDK 21
uses: actions/setup-java@v4
Expand All @@ -43,7 +43,7 @@ jobs:
type=semver,pattern={{major}}.{{minor}}
- name: Build and push Docker images
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
platforms: linux/amd64,linux/arm64
Expand Down

0 comments on commit 12b39c0

Please sign in to comment.