From 9a3158ca3eb3c1dbff2890e5472e4923d282715b Mon Sep 17 00:00:00 2001
From: github actions
Date: Wed, 9 Oct 2024 13:27:31 +0000
Subject: [PATCH 1/8] v2.106.0 changelog update
---
CHANGELOG.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8e3dd7cb..bf1429433 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v2.106.0 - 2024-10-09
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.105.7...v2.106.0)
+
## v2.105.7 - 2024-10-02
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.105.6...v2.105.7)
From 2bb07a22ad29685f51f2ffd78d812836b45b9771 Mon Sep 17 00:00:00 2001
From: leomendoza123
Date: Wed, 9 Oct 2024 07:31:50 -0600
Subject: [PATCH 2/8]
9417-update-the-public-api-developer-tools-page-with-new-text (#2361)
---
.../terms-of-use/terms-of-use.component.html | 79 ++++++++++++-------
.../developer-tools.en.properties | 30 ++++---
2 files changed, 70 insertions(+), 39 deletions(-)
diff --git a/src/app/developer-tools/components/terms-of-use/terms-of-use.component.html b/src/app/developer-tools/components/terms-of-use/terms-of-use.component.html
index 895fab59e..91f92fc45 100644
--- a/src/app/developer-tools/components/terms-of-use/terms-of-use.component.html
+++ b/src/app/developer-tools/components/terms-of-use/terms-of-use.component.html
@@ -8,50 +8,73 @@
- ORCID offers an API (Application Programming Interface) that allows your
- systems and applications to connect to the ORCID registry via
- machine-to-machine communication. Using the Public API, your system or
- application can:
+ ORCID offers a free Public API (Application Programming Interface) that allows
+ your systems and applications to connect to the ORCID registry for
+ non-commercial use
+
+
+ By registering for Public API Credentials, your system or application can:
-
- Allow users to sign into your system/application with their ORCID username
- and password
+ Allow users to sign into your system/application with their ORCID account
-
- Get a user's authenticated ORCID iD
+ Obtain a user's’ authenticated ORCID iDs
-
- Retrieve a machine-readable version of a user's public ORCID record
+ Read public information from ORCID records in machine-readable format
-
- Perform a machine-generated search of the ORCID registry
+ Search public data in the ORCID Registry
+
+ -
+ Obtain a higher usage quota than the ORCID Anonymous API
The ORCID API is RESTful and usesThe ORCID Public API is RESTful and uses
OAuth 2.0OAuth, a well-established, standard protocol for user-based
- permissions.
+ >, a well-established, standard protocol for user-based permissions.
+
- Public Client Applications are granted to individuals and not organizations,
- and your Public Client is personal to you (even if you are using it in
+ Public API Credentials are granted to individuals and not organizations, and
+ your Public API Credentials are personal to you (even if being used in
connection with your work for an organization).
+
+
+ If you need access to an ORCID API for commercial use, need a higher usage
+ quota, organizational administration of your API credentials, or the ability
+ to write data to or access Trusted Party data in ORCID records, our
+
+
+ Member API
+
+
+ is available to ORCID member organizations.
+
+
+
Additional resources
@@ -60,7 +83,7 @@
class="orc-font-body-large no-margin-bottom"
i18n="@@developerTools.orcidPublicClientTermsOfService"
>
- ORCID Public Client Terms of Service
+ ORCID Public APIs Terms of Service
@@ -91,10 +114,8 @@
- The ORCID Public API allows you to request permission to receive an
- authenticated ORCID iD, to read public information from an ORCID record and
- to search public data on the ORCID registry according to the conditions
- stated in the
+ The ORCID Public API is free for non-commercial use by individuals as stated
+ in the
target="_blank"
class="underline"
i18n="@@developerTools.publicClientTermsOfService"
- >Public Client Terms of Service.Public APIs Terms of Service.
+
+ By “non-commercial” we mean that you may not charge any re-use fees for the
+ Public API, and you may not make use of the Public API in connection with
+ any revenue-generating product or service
+
@@ -128,9 +154,8 @@
[(ngModel)]="checked"
[disabled]="!emailAlreadyVerified"
i18n="@@developerTools.haveReadAndAgreeToTheOrcidPublicClientTermsOfService"
- >I have read and agree to the ORCID Public Client Terms of
- Service
+ >I have read and agree to the ORCID Public APIs Terms of Service
+
diff --git a/src/locale/properties/developer-tools/developer-tools.en.properties b/src/locale/properties/developer-tools/developer-tools.en.properties
index 100ee8178..0b913fb28 100644
--- a/src/locale/properties/developer-tools/developer-tools.en.properties
+++ b/src/locale/properties/developer-tools/developer-tools.en.properties
@@ -4,23 +4,23 @@ developerTools.ressettingYourClientSecret=Resetting your client secret will gene
developerTools.developerTools=Developer tools
developerTools.thisSectionIsIntended=This section is intended for developers who plan to integrate ORCID into their system using the ORCID Public API.
developerTools.gettingStarted=Getting started with the free ORCID Public API
-developerTools.orcidOffersAnApi=ORCID offers an API (Application Programming Interface) that allows your systems and applications to connect to the ORCID registry via machine-to-machine communication. Using the Public API, your system or application can:
-developerTools.allowUserToSignInto=Allow users to sign into your system/application with their ORCID username and password
-developerTools.getAUserAuthenticated=Get a user's authenticated ORCID iD
-developerTools.retrieveMachineReadable=Retrieve a machine-readable version of a user's public ORCID record
-developerTools.performMachineSearch=Perform a machine-generated search of the ORCID registry
-developerTools.orcidApiResful=The ORCID API is RESTful and uses
-developerTools.oauth20=OAuth 2.0
+developerTools.orcidOffersAnApi=ORCID offers a free Public API (Application Programming Interface) that allows your systems and applications to connect to the ORCID registry for non-commercial use
+developerTools.allowUserToSignInto=Allow users to sign into your system/application with their ORCID account
+developerTools.getAUserAuthenticated=Obtain a user's’ authenticated ORCID iDs
+developerTools.retrieveMachineReadable=Read public information from ORCID records in machine-readable format
+developerTools.performMachineSearch=Search public data in the ORCID Registry
+developerTools.orcidApiResful=The ORCID Public API is RESTful and uses
+developerTools.oauth20=OAuth
developerTools.wellEstablishedStandard=, a well-established, standard protocol for user-based permissions.
-developerTools.publicClientApplicationsAreGranted=Public Client Applications are granted to individuals and not organizations, and your Public Client is personal to you (even if you are using it in connection with your work for an organization).
+developerTools.publicClientApplicationsAreGranted=Public API Credentials are granted to individuals and not organizations, and your Public API Credentials are personal to you (even if being used in connection with your work for an organization).
developerTools.additionalResources=Additional resources
developerTools.readThePublicApisDocumentation=Read the Public API documentation
developerTools.fillOutMoreAobutTheDifferences=Find out more about the differences between the Public and Member APIs
-developerTools.orcidPublicClientTermsOfService=ORCID Public Client Terms of Service
-developerTools.theOrcidPublicApiAllowsYouToRequestPermission=The ORCID Public API allows you to request permission to receive an authenticated ORCID iD, to read public information from an ORCID record and to search public data on the ORCID registry according to the conditions stated in the
-developerTools.publicClientTermsOfService=Public Client Terms of Service.
+developerTools.orcidPublicClientTermsOfService=ORCID Public APIs Terms of Service
+developerTools.theOrcidPublicApiAllowsYouToRequestPermission=The ORCID Public API is free for non-commercial use by individuals as stated in the
+developerTools.publicClientTermsOfService=Public APIs Terms of Service.
developerTools.youMustAcceptThePublicClientTermsOfService=You must accept the Public Client Terms of Service before you can register for your Public API credentials.
-developerTools.haveReadAndAgreeToTheOrcidPublicClientTermsOfService=I have read and agree to the ORCID Public Client Terms of Service
+developerTools.haveReadAndAgreeToTheOrcidPublicClientTermsOfService=I have read and agree to the ORCID Public APIs Terms of Service
developerTools.registerForYourOrcidPublicApiCredentials=Register for your ORCID Public API credentials
developerTools.warningDuplicated=You’ve registered for your ORCID Public API credentials
developerTools.addYourApplicationDetails=Add your application details and one or more redirect URIs in the form below. Once these details are saved we’ll generate your client ID and secret so you can start using the Public API right away.
@@ -76,3 +76,9 @@ developerTools.replaceWithRedirect=REPLACE WITH REDIRECT URI
developerTools.replaceWithOauth=REPLACE WITH OAUTH CODE
developerTools.backToMyRecod=Back to my record
developerTools.exampleCode2=example code
+developerTools.orcidOffersAnApi2=By registering for Public API Credentials, your system or application can:
+developerTools.obtainHigher=Obtain a higher usage quota than the ORCID Anonymous API
+developerTools.publicClientApplicationsAreGranted2=If you need access to an ORCID API for commercial use, need a higher usage quota, organizational administration of your API credentials, or the ability to write data to or access Trusted Party data in ORCID records, our
+developerTools.memberApi=Member API
+developerTools.mayBeMoreAppropriate=is available to ORCID member organizations.
+developerTools.byRegisteringForPublicApi=By “non-commercial” we mean that you may not charge any re-use fees for the Public API, and you may not make use of the Public API in connection with any revenue-generating product or service
\ No newline at end of file
From f967a7142eec2f415ea128f5523b86f7b483741a Mon Sep 17 00:00:00 2001
From: amontenegro
Date: Wed, 9 Oct 2024 13:37:40 +0000
Subject: [PATCH 3/8] =?UTF-8?q?=F0=9F=A4=96=20GITHUB=20ACTIONS=20i18n=20ge?=
=?UTF-8?q?nerator?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../developer-tools/developer-tools.en.properties | 2 +-
.../developer-tools/developer-tools.lr.properties | 6 ++++++
.../developer-tools/developer-tools.rl.properties | 6 ++++++
.../developer-tools/developer-tools.xx.properties | 6 ++++++
4 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/src/locale/properties/developer-tools/developer-tools.en.properties b/src/locale/properties/developer-tools/developer-tools.en.properties
index 0b913fb28..a20d30706 100644
--- a/src/locale/properties/developer-tools/developer-tools.en.properties
+++ b/src/locale/properties/developer-tools/developer-tools.en.properties
@@ -81,4 +81,4 @@ developerTools.obtainHigher=Obtain a higher usage quota than the ORCID Anonymous
developerTools.publicClientApplicationsAreGranted2=If you need access to an ORCID API for commercial use, need a higher usage quota, organizational administration of your API credentials, or the ability to write data to or access Trusted Party data in ORCID records, our
developerTools.memberApi=Member API
developerTools.mayBeMoreAppropriate=is available to ORCID member organizations.
-developerTools.byRegisteringForPublicApi=By “non-commercial” we mean that you may not charge any re-use fees for the Public API, and you may not make use of the Public API in connection with any revenue-generating product or service
\ No newline at end of file
+developerTools.byRegisteringForPublicApi=By “non-commercial” we mean that you may not charge any re-use fees for the Public API, and you may not make use of the Public API in connection with any revenue-generating product or service
diff --git a/src/locale/properties/developer-tools/developer-tools.lr.properties b/src/locale/properties/developer-tools/developer-tools.lr.properties
index 6e5b29f27..bb632f179 100644
--- a/src/locale/properties/developer-tools/developer-tools.lr.properties
+++ b/src/locale/properties/developer-tools/developer-tools.lr.properties
@@ -76,3 +76,9 @@ developerTools.replaceWithRedirect=LR
developerTools.replaceWithOauth=LR
developerTools.backToMyRecod=LR
developerTools.exampleCode2=LR
+developerTools.orcidOffersAnApi2=LR
+developerTools.obtainHigher=LR
+developerTools.publicClientApplicationsAreGranted2=LR
+developerTools.memberApi=LR
+developerTools.mayBeMoreAppropriate=LR
+developerTools.byRegisteringForPublicApi=LR
diff --git a/src/locale/properties/developer-tools/developer-tools.rl.properties b/src/locale/properties/developer-tools/developer-tools.rl.properties
index 7a4a094b5..ba5794198 100644
--- a/src/locale/properties/developer-tools/developer-tools.rl.properties
+++ b/src/locale/properties/developer-tools/developer-tools.rl.properties
@@ -76,3 +76,9 @@ developerTools.replaceWithRedirect=RL
developerTools.replaceWithOauth=RL
developerTools.backToMyRecod=RL
developerTools.exampleCode2=RL
+developerTools.orcidOffersAnApi2=RL
+developerTools.obtainHigher=RL
+developerTools.publicClientApplicationsAreGranted2=RL
+developerTools.memberApi=RL
+developerTools.mayBeMoreAppropriate=RL
+developerTools.byRegisteringForPublicApi=RL
diff --git a/src/locale/properties/developer-tools/developer-tools.xx.properties b/src/locale/properties/developer-tools/developer-tools.xx.properties
index 0934b3925..55317fc15 100644
--- a/src/locale/properties/developer-tools/developer-tools.xx.properties
+++ b/src/locale/properties/developer-tools/developer-tools.xx.properties
@@ -76,3 +76,9 @@ developerTools.replaceWithRedirect=X
developerTools.replaceWithOauth=X
developerTools.backToMyRecod=X
developerTools.exampleCode2=X
+developerTools.orcidOffersAnApi2=X
+developerTools.obtainHigher=X
+developerTools.publicClientApplicationsAreGranted2=X
+developerTools.memberApi=X
+developerTools.mayBeMoreAppropriate=X
+developerTools.byRegisteringForPublicApi=X
From de67b8d9a0b3ac483b6b5d32cadb448da0751ac9 Mon Sep 17 00:00:00 2001
From: Giles Westwood
Date: Wed, 9 Oct 2024 15:01:46 +0100
Subject: [PATCH 4/8] feat/docker-builds (#2360)
* feat: docker builds with separate dockerfiles from dev
* match external port to current standard
---------
Co-authored-by: Angel Montenegro
---
.github/workflows/bld_all_docker.yml | 89 +++++++++++
.github/workflows/bld_docker.yml | 149 +++++++++++++++++++
.github/workflows/build_test_release.yml | 17 +++
.github/workflows/build_test_release_tag.yml | 18 +++
Dockerfile.build | 36 +++++
build-docker.sh | 3 +
docker-compose.build.yml | 12 ++
7 files changed, 324 insertions(+)
create mode 100644 .github/workflows/bld_all_docker.yml
create mode 100644 .github/workflows/bld_docker.yml
create mode 100644 Dockerfile.build
create mode 100755 build-docker.sh
create mode 100644 docker-compose.build.yml
diff --git a/.github/workflows/bld_all_docker.yml b/.github/workflows/bld_all_docker.yml
new file mode 100644
index 000000000..3dd354d64
--- /dev/null
+++ b/.github/workflows/bld_all_docker.yml
@@ -0,0 +1,89 @@
+name: bld_all_docker
+
+permissions:
+ checks: write
+ contents: read
+ issues: read
+ pull-requests: write
+
+on:
+ workflow_call:
+ inputs:
+ version_tag:
+ description: 'Version tag to use: (bump must also be set to none to keep a specific version'
+ required: false
+ default: 'latest'
+ type: string
+ bump:
+ description: 'whether to bump the version number by a major minor patch'
+ required: false
+ default: 'patch'
+ type: string
+ ref:
+ description: 'git reference to use with the checkout use default_branch to have that calculated'
+ required: false
+ default: "default"
+ type: string
+
+ workflow_dispatch:
+ inputs:
+ version_tag:
+ description: 'Version tag to use: (bump must also be set to none to keep a specific version'
+ required: false
+ default: 'latest'
+ type: string
+ bump:
+ description: 'whether to bump the version number by a major minor patch'
+ required: false
+ default: 'patch'
+ type: string
+ ref:
+ description: 'git reference to use with the checkout use default_branch to have that calculated'
+ required: false
+ default: "default"
+ type: string
+
+jobs:
+
+ bld_angular_prod:
+ uses: ./.github/workflows/bld_docker.yml
+ secrets: inherit # pass all secrets
+ with:
+ docker_name: orcid/registry/orcid-web-frontend-prod
+ context: .
+ version_tag: ${{ inputs.version_tag }}
+ bump: ${{ inputs.bump }}
+ build_args: "build_env=prod"
+ file: Dockerfile.build
+ bld_angular_sandbox:
+ uses: ./.github/workflows/bld_docker.yml
+ secrets: inherit # pass all secrets
+ with:
+ docker_name: orcid/registry/orcid-web-frontend-sandbox
+ context: .
+ version_tag: ${{ inputs.version_tag }}
+ bump: ${{ inputs.bump }}
+ build_args: "build_env=sandbox"
+ file: Dockerfile.build
+ bld_angular_qa:
+ uses: ./.github/workflows/bld_docker.yml
+ secrets: inherit # pass all secrets
+ with:
+ docker_name: orcid/registry/orcid-web-frontend-qa
+ context: .
+ version_tag: ${{ inputs.version_tag }}
+ bump: ${{ inputs.bump }}
+ build_args: "build_env=qa"
+ file: Dockerfile.build
+ bld_angular_int:
+ uses: ./.github/workflows/bld_docker.yml
+ secrets: inherit # pass all secrets
+ with:
+ docker_name: orcid/registry/orcid-web-frontend-int
+ context: .
+ version_tag: ${{ inputs.version_tag }}
+ bump: ${{ inputs.bump }}
+ build_args: "build_env=int"
+ file: Dockerfile.build
+
+
diff --git a/.github/workflows/bld_docker.yml b/.github/workflows/bld_docker.yml
new file mode 100644
index 000000000..8402339f6
--- /dev/null
+++ b/.github/workflows/bld_docker.yml
@@ -0,0 +1,149 @@
+name: bld_docker
+run-name: ${{ inputs.docker_name }}
+
+permissions:
+ checks: write
+ contents: read
+ issues: read
+ pull-requests: write
+
+on:
+ workflow_call:
+ inputs:
+ docker_name:
+ description: 'Name of the docker image to build'
+ required: false
+ default: "orcid/version-bumping-test"
+ type: string
+ context:
+ description: 'Name of the context in the repo'
+ required: false
+ default: "."
+ type: string
+ build_args:
+ description: 'arguments'
+ required: false
+ default: ""
+ type: string
+ file:
+ description: 'specify a custom dockerfile'
+ required: false
+ default: ""
+ type: string
+ version_tag:
+ description: 'Name of the tag to build'
+ required: false
+ default: 'latest'
+ type: string
+ bump:
+ description: 'whether to bump the version number by a major minor patch amount or none'
+ required: false
+ default: 'patch'
+ type: string
+ ref:
+ description: 'git reference to use with the checkout use default_branch to have that calculated'
+ required: false
+ default: "default"
+ type: string
+
+ workflow_dispatch:
+ inputs:
+ docker_name:
+ description: 'Name of the docker image to build'
+ required: false
+ default: "orcid/version-bumping-test"
+ type: string
+ context:
+ description: 'Name of the context in the repo'
+ required: false
+ default: "."
+ type: string
+ build_args:
+ description: 'arguments'
+ required: false
+ default: ""
+ type: string
+ file:
+ description: 'specify a custom dockerfile'
+ required: false
+ default: ""
+ type: string
+ version_tag:
+ description: 'Name of the tag to build'
+ required: false
+ default: 'latest'
+ type: string
+ bump:
+ description: 'whether to bump the version number by a major minor patch amount or none'
+ required: false
+ default: 'patch'
+ type: string
+ ref:
+ description: 'git reference to use with the checkout use default_branch to have that calculated'
+ required: false
+ default: "default"
+ type: string
+
+
+jobs:
+ bld_docker:
+ runs-on: ubuntu-latest
+ steps:
+ - name: git-checkout-ref-action
+ id: ref
+ uses: ORCID/git-checkout-ref-action@main
+ with:
+ default_branch: ${{ github.event.repository.default_branch }}
+ ref: ${{ inputs.ref }}
+
+ - uses: actions/checkout@v3
+ with:
+ ref: ${{ steps.ref.outputs.ref }}
+ # checkout some history so we can scan commits for bump messages
+ # NOTE: history does not include tags!
+ fetch-depth: 100
+
+ - name: find next version
+ id: version
+ uses: ORCID/version-bump-action@main
+ with:
+ version_tag: ${{ inputs.version_tag }}
+ bump: ${{ inputs.bump }}
+
+ - uses: docker/setup-buildx-action@v2
+ - uses: actions/cache@v3
+ with:
+ path: /tmp/.buildx-cache
+ # each cache needs a unique key for the job
+ key: ${{ runner.os }}-buildx-${{ hashFiles(inputs.context) }}
+ # Alternative restore keys if no exact match is found
+ # I /think/ this means that other docker buildx jobs could help out here
+ restore-keys: |
+ ${{ runner.os }}-buildx-
+ - name: Login to private registry
+ uses: docker/login-action@v2
+ with:
+ registry: ${{ secrets.DOCKER_REG_PRIVATE }}
+ username: ${{ secrets.DOCKER_USER }}
+ password: ${{ secrets.DOCKER_PASSWORD }}
+
+ - name: nasty hack to allow dynamic defaults
+ id: dynamic_defaults
+ run: |
+ FILE="${{ github.event.inputs.file }}"
+ echo "default_file=${FILE:-${{ inputs.context }}/Dockerfile}" >> "$GITHUB_OUTPUT"
+
+ - name: show the dynamic defaults
+ run: |
+ echo ${{ steps.dynamic_defaults.outputs.default_file }}
+
+ - uses: docker/build-push-action@v3
+ with:
+ push: true
+ tags: ${{ secrets.DOCKER_REG_PRIVATE }}/${{ inputs.docker_name}}:${{ steps.version.outputs.version_tag_numeric }}
+ context: ${{ inputs.context }}
+ cache-from: type=local,src=/tmp/.buildx-cache
+ cache-to: type=local,dest=/tmp/.buildx-cache
+ build-args: ${{ inputs.build_args }}
+ file: ${{ steps.dynamic_defaults.outputs.default_file }}
+
diff --git a/.github/workflows/build_test_release.yml b/.github/workflows/build_test_release.yml
index 602304b4a..209d9196d 100644
--- a/.github/workflows/build_test_release.yml
+++ b/.github/workflows/build_test_release.yml
@@ -98,3 +98,20 @@ jobs:
bump: ${{ inputs.bump }}
ref: ${{ inputs.ref }}
+ bld_all_docker:
+ uses: ./.github/workflows/bld_all_docker.yml
+ secrets: inherit # pass all secrets for uploading assets
+ needs:
+ - lint
+ - bld_all_yarn
+ - format_i18n
+ - format_prettier
+ permissions:
+ checks: write
+ contents: read
+ issues: read
+ pull-requests: write
+ with:
+ version_tag: ${{ inputs.version_tag }}
+ bump: ${{ inputs.bump }}
+ ref: ${{ inputs.ref }}
diff --git a/.github/workflows/build_test_release_tag.yml b/.github/workflows/build_test_release_tag.yml
index 179b1b033..2bb93024d 100644
--- a/.github/workflows/build_test_release_tag.yml
+++ b/.github/workflows/build_test_release_tag.yml
@@ -98,6 +98,24 @@ jobs:
bump: ${{ inputs.bump }}
ref: ${{ inputs.ref }}
+ bld_all_docker:
+ uses: ./.github/workflows/bld_all_docker.yml
+ secrets: inherit # pass all secrets for uploading assets
+ needs:
+ - lint
+ - bld_all_yarn
+ - format_i18n
+ - format_prettier
+ permissions:
+ checks: write
+ contents: read
+ issues: read
+ pull-requests: write
+ with:
+ version_tag: ${{ inputs.version_tag }}
+ bump: ${{ inputs.bump }}
+ ref: ${{ inputs.ref }}
+
##############################################################################
rel_tag:
diff --git a/Dockerfile.build b/Dockerfile.build
new file mode 100644
index 000000000..fe7a968c0
--- /dev/null
+++ b/Dockerfile.build
@@ -0,0 +1,36 @@
+# dependencies docker build
+
+# match version from .tool-versions
+FROM maven:3.6.3-jdk-11 AS maven
+
+ARG build_env
+
+WORKDIR /build
+
+# copy only poms for max cachability of just dependency downloads
+COPY pom.xml .
+
+# download maven dependencies and ignore that some components will fail
+RUN mvn -T 1C --batch-mode dependency:resolve --fail-never -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+
+COPY ./scripts ./scripts
+# for yarn build
+COPY *.json .
+COPY *.lock .
+
+COPY ./src ./src
+
+RUN mvn -T 1C --batch-mode \
+ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
+ --file "pom.xml" \
+ --activate-profiles "${build_env}" -Dnodejs.workingDirectory=. \
+ package -Dmaven.test.skip
+
+
+# For Java 11 and Tomcat 9
+#FROM tomcat:9.0.93-jdk11-temurin-jammy
+FROM tomcat:9.0.91-jdk11-temurin-focal
+
+# copy war file from build
+COPY --from=maven /build/target/*.war /usr/local/tomcat/webapps/orcid-frontend.war
+
diff --git a/build-docker.sh b/build-docker.sh
new file mode 100755
index 000000000..68879e704
--- /dev/null
+++ b/build-docker.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+docker compose -f docker-compose.build.yml build
diff --git a/docker-compose.build.yml b/docker-compose.build.yml
new file mode 100644
index 000000000..1836d1b61
--- /dev/null
+++ b/docker-compose.build.yml
@@ -0,0 +1,12 @@
+version: '2'
+services:
+ angular:
+ image: ${DOCKER_REG_PRIVATE}/orcid/registry/orcid-angular:${TAG:-0.0.1}
+ #entrypoint: sleep infinity
+ build:
+ context: .
+ dockerfile: Dockerfile.build
+ args:
+ build_env: ${BUILD_ENV:-prod}
+ ports:
+ - 0.0.0.0:13105:8080
From fecd5b8379ec821a882227e4ad5e6d738e1cd775 Mon Sep 17 00:00:00 2001
From: github actions
Date: Wed, 9 Oct 2024 14:02:24 +0000
Subject: [PATCH 5/8] v2.106.1 changelog update
---
CHANGELOG.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf1429433..8483faa55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v2.106.1 - 2024-10-09
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.106.0...v2.106.1)
+
## v2.106.0 - 2024-10-09
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.105.7...v2.106.0)
From c745f69ae37a47d96bb0c539e58d31c137dea274 Mon Sep 17 00:00:00 2001
From: github actions
Date: Wed, 9 Oct 2024 14:26:22 +0000
Subject: [PATCH 6/8] v2.106.2 changelog update
---
CHANGELOG.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8483faa55..1353f1a09 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v2.106.2 - 2024-10-09
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.106.1...v2.106.2)
+
## v2.106.1 - 2024-10-09
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.106.0...v2.106.1)
From f4607d2686fb07ba06692b6db4579d6443fc21c9 Mon Sep 17 00:00:00 2001
From: leomendoza123
Date: Thu, 10 Oct 2024 07:27:06 -0600
Subject: [PATCH 7/8] 9428-summary-overflow-issues (#2362)
---
.../component/trusted-summary/trusted-summary.component.scss | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.scss b/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.scss
index 7c2a53dde..199aebf60 100644
--- a/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.scss
+++ b/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.scss
@@ -2,6 +2,8 @@
width: 100%;
display: flex;
justify-content: center;
+ height: 100vh;
+ overflow: scroll;
}
main.stand-alone-mode {
From 3225f8d188677987b61bb5d1bad4a9cb6c0c9b1f Mon Sep 17 00:00:00 2001
From: github actions
Date: Thu, 10 Oct 2024 13:50:54 +0000
Subject: [PATCH 8/8] v2.106.3 changelog update
---
CHANGELOG.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1353f1a09..c732744df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v2.106.3 - 2024-10-10
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.106.2...v2.106.3)
+
## v2.106.2 - 2024-10-09
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.106.1...v2.106.2)