From 73d33d20b52e251eae26ee7d7e2bf008f03c7ea2 Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Wed, 4 Oct 2023 17:43:34 +0200 Subject: [PATCH 1/4] build(release): provide image also for arm64 --- .github/workflows/release-release_candidate.yml | 4 ++++ .github/workflows/release.yml | 4 ++++ .github/workflows/release_candidate.yml | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/.github/workflows/release-release_candidate.yml b/.github/workflows/release-release_candidate.yml index 14f7369f..b5019c47 100644 --- a/.github/workflows/release-release_candidate.yml +++ b/.github/workflows/release-release_candidate.yml @@ -74,6 +74,9 @@ jobs: - name: Build Application run: yarn build + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - name: Login to DockerHub if: github.event_name != 'pull_request' uses: docker/login-action@v2 @@ -95,6 +98,7 @@ jobs: with: context: . file: .conf/Dockerfile + platforms: linux/amd64, linux/arm64 push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 793035d2..31f6d9f4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -75,6 +75,9 @@ jobs: - name: Build Application run: yarn build + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - name: Login to DockerHub if: github.event_name != 'pull_request' uses: docker/login-action@v2 @@ -96,6 +99,7 @@ jobs: with: context: . file: .conf/Dockerfile + platforms: linux/amd64, linux/arm64 push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/release_candidate.yml b/.github/workflows/release_candidate.yml index 69dbbc1a..737614fd 100644 --- a/.github/workflows/release_candidate.yml +++ b/.github/workflows/release_candidate.yml @@ -55,6 +55,9 @@ jobs: - name: Build Application run: yarn build + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - name: Login to DockerHub if: github.event_name != 'pull_request' uses: docker/login-action@v2 @@ -76,6 +79,7 @@ jobs: with: context: . file: .conf/Dockerfile + platforms: linux/amd64, linux/arm64 push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} From 9777fb623460e79cf096a96015562f36ed30cb2a Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Wed, 4 Oct 2023 17:44:24 +0200 Subject: [PATCH 2/4] release(1.6.1): update changelog --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac400cc6..e785e79e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,17 @@ New features, fixed bugs, known defects and other noteworthy changes to each release of the Catena-X Portal Assets. +## 1.6.1 + +### Change +* Technical documentation enhanced +* Typos for company roles fixed + +### Technical Support +* Build images also for arm64, in addition to amd64 +* Security.md updated +* npm-get-version action updated + ## 1.6.0 ### Change From 3df9ebf876d575ef1ceabd4a41eb168618216fd1 Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Wed, 4 Oct 2023 17:45:10 +0200 Subject: [PATCH 3/4] release(1.6.1): bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fdfef20f..b275643e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cx-portal-assets", - "version": "v1.6.0", + "version": "v1.6.1", "description": "Shared frontend content and static assets for the Catena-X Portal", "main": "index.js", "repository": "git@github.com:eclipse-tractusx/portal-assets.git", From 47bb604f9475dc43cc34648a3fa3628bdb7d6967 Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Wed, 4 Oct 2023 17:50:04 +0200 Subject: [PATCH 4/4] release(1.6.1): update dependencies file --- DEPENDENCIES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index e0161d72..4337930f 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -45,7 +45,7 @@ npm/npmjs/-/express/4.18.2, MIT, approved, clearlydefined npm/npmjs/-/fill-range/7.0.1, MIT, approved, clearlydefined npm/npmjs/-/finalhandler/1.2.0, MIT, approved, clearlydefined npm/npmjs/-/find-replace/3.0.0, MIT, approved, clearlydefined -npm/npmjs/-/follow-redirects/1.15.2, MIT, approved, clearlydefined +npm/npmjs/-/follow-redirects/1.15.2, MIT, approved, #10782 npm/npmjs/-/forwarded/0.2.0, MIT, approved, clearlydefined npm/npmjs/-/fresh/0.5.2, MIT, approved, clearlydefined npm/npmjs/-/function-bind/1.1.1, MIT, approved, clearlydefined