From b474d885f73748cc9e6556cbff808d51d0acbd9a Mon Sep 17 00:00:00 2001 From: Karsten Thiems <150006841+typecastcloud@users.noreply.github.com> Date: Mon, 17 Jun 2024 10:36:45 +0200 Subject: [PATCH 1/3] chore(build): add full dockerfile containing yarn step (#187) * chore(build): add full dockerfile containing yarn step We can create images without yarn installed and this change streamlines dockerfiles across portal repositories. * Rename existing dockerfile and update references in workflows * Add comments to dockerfile to describe purpose. --- .conf/Dockerfile.full | 53 +++++++++++++++++++ .conf/{Dockerfile => Dockerfile.prebuilt} | 4 ++ .conf/docker-notice-registration.md | 2 +- .github/workflows/build.yml | 2 +- .../workflows/release-release_candidate.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/release_candidate.yml | 2 +- 7 files changed, 62 insertions(+), 5 deletions(-) create mode 100644 .conf/Dockerfile.full rename .conf/{Dockerfile => Dockerfile.prebuilt} (97%) diff --git a/.conf/Dockerfile.full b/.conf/Dockerfile.full new file mode 100644 index 00000000..e4c6022f --- /dev/null +++ b/.conf/Dockerfile.full @@ -0,0 +1,53 @@ +############################################################### +# Copyright (c) 2024 Contributors to the Eclipse Foundation +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License, Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0. +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 +############################################################### + +# +# Dockerfile with full build after checkout +# + +# Step 1 +FROM node:21-alpine as build-step +ARG http_proxy=$http_proxy +ARG https_proxy=$https_proxy +ARG no_proxy=$no_proxy +RUN apk update && apk add --no-cache jq +COPY . /app +WORKDIR /app +RUN yarn +RUN yarn build + +# Step 2 +FROM nginxinc/nginx-unprivileged:alpine +COPY .conf/nginx.conf /etc/nginx/conf.d/default.conf +COPY --from=build-step /app/build /usr/share/nginx/html +# Change to root user +USER root +# Rename index.html to index.html.reference, to be used by env variables inject script +RUN mv /usr/share/nginx/html/index.html /usr/share/nginx/html/index.html.reference +# Create symlink for tmp for index.html to enable readOnlyRootFilesystem +RUN ln -s /tmp/index.html /usr/share/nginx/html/index.html +# Add env variables inject script and mark as executable +COPY ./scripts/inject-dynamic-env.sh /docker-entrypoint.d/00-inject-dynamic-env.sh +RUN chmod +x /docker-entrypoint.d/00-inject-dynamic-env.sh +# Install bash for env variables inject script +RUN apk update && apk add --no-cache bash +# Make nginx owner of /usr/share/nginx/html/ and change to nginx user +RUN chown -R 101:101 /usr/share/nginx/html/ +# Change to nginx user +USER 101 diff --git a/.conf/Dockerfile b/.conf/Dockerfile.prebuilt similarity index 97% rename from .conf/Dockerfile rename to .conf/Dockerfile.prebuilt index 41474db2..c0540670 100644 --- a/.conf/Dockerfile +++ b/.conf/Dockerfile.prebuilt @@ -17,6 +17,10 @@ # SPDX-License-Identifier: Apache-2.0 ############################################################### +# +# Dockerfile with prebuilt webapp +# + FROM nginxinc/nginx-unprivileged:alpine COPY .conf/nginx.conf /etc/nginx/conf.d/default.conf COPY ./build /usr/share/nginx/html diff --git a/.conf/docker-notice-registration.md b/.conf/docker-notice-registration.md index f0603a59..169fc27b 100644 --- a/.conf/docker-notice-registration.md +++ b/.conf/docker-notice-registration.md @@ -8,7 +8,7 @@ __Portal Frontend Registration__ - GitHub: https://github.com/eclipse-tractusx/portal-frontend-registration - Project home: https://projects.eclipse.org/projects/automotive.tractusx -- Dockerfile: https://github.com/eclipse-tractusx/portal-frontend-registration/blob/main/.conf/Dockerfile +- Dockerfile: https://github.com/eclipse-tractusx/portal-frontend-registration/blob/main/.conf/Dockerfile.prebuilt - Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/portal-frontend-registration/blob/main/LICENSE) __Used base images__ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bc405581..8979139f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -87,7 +87,7 @@ jobs: uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0 with: context: . - file: .conf/Dockerfile + file: .conf/Dockerfile.prebuilt platforms: linux/amd64, linux/arm64 push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} diff --git a/.github/workflows/release-release_candidate.yml b/.github/workflows/release-release_candidate.yml index 712681ab..13f075e6 100644 --- a/.github/workflows/release-release_candidate.yml +++ b/.github/workflows/release-release_candidate.yml @@ -111,7 +111,7 @@ jobs: uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0 with: context: . - file: .conf/Dockerfile + file: .conf/Dockerfile.prebuilt platforms: linux/amd64, linux/arm64 push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 80d2585d..8bab83b6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -112,7 +112,7 @@ jobs: uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0 with: context: . - file: .conf/Dockerfile + file: .conf/Dockerfile.prebuilt platforms: linux/amd64, linux/arm64 push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} diff --git a/.github/workflows/release_candidate.yml b/.github/workflows/release_candidate.yml index dcd5e241..273a03dd 100644 --- a/.github/workflows/release_candidate.yml +++ b/.github/workflows/release_candidate.yml @@ -87,7 +87,7 @@ jobs: uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0 with: context: . - file: .conf/Dockerfile + file: .conf/Dockerfile.prebuilt platforms: linux/amd64, linux/arm64 push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} From ff3581509b2ea3c7f231ae38f5d88c508825e61d Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Fri, 21 Jun 2024 15:40:32 +0200 Subject: [PATCH 2/3] chore(TRG-7): update licensing and legal docs (#197) https://github.com/eclipse-tractusx/portal-frontend-registration/issues/185 --- CONTRIBUTING.md | 28 +++++++++++++++-- DEPENDENCIES | 36 +++++++++++----------- LICENSES/CC-BY-4.0.txt => LICENSE_non-code | 4 +-- NOTICE.md | 13 ++++++-- 4 files changed, 56 insertions(+), 25 deletions(-) rename LICENSES/CC-BY-4.0.txt => LICENSE_non-code (99%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e7ce01fc..3b516220 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -16,6 +16,19 @@ Catena-X alliance focusing on parts traceability. * https://projects.eclipse.org/projects/automotive.tractusx +## Project licenses + +The Tractus-X project uses the following licenses: + +* Apache-2.0 for code +* CC-BY-4.0 for non-code + +## Terms of Use + +This repository is subject to the Terms of Use of the Eclipse Foundation + +* https://www.eclipse.org/legal/termsofuse.php + ## Developer resources Information regarding source code management, builds, coding standards, and @@ -23,9 +36,20 @@ more. * https://projects.eclipse.org/projects/automotive.tractusx/developer -The project maintains the source code repositories in the following GitHub organization: +Getting started: + +* https://eclipse-tractusx.github.io/docs/developer + +* https://projects.eclipse.org/projects/automotive.tractusx/developer + +The project maintains the source code repositories -* https://github.com/eclipse-tractusx/ +- https://github.com/eclipse-tractusx/portal-frontend +- https://github.com/eclipse-tractusx/portal-frontend-registration +- https://github.com/eclipse-tractusx/portal-shared-components +- https://github.com/eclipse-tractusx/portal-backend +- https://github.com/eclipse-tractusx/portal-assets +- https://github.com/eclipse-tractusx/portal-iam ## Eclipse Development Process diff --git a/DEPENDENCIES b/DEPENDENCIES index 6aaa91b5..a45f0294 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -4,7 +4,7 @@ npm/npmjs/-/acorn-jsx/5.3.2, MIT, approved, clearlydefined npm/npmjs/-/acorn-walk/8.3.2, MIT, approved, #11942 npm/npmjs/-/acorn/8.11.3, MIT, approved, clearlydefined npm/npmjs/-/agent-base/6.0.2, MIT, approved, clearlydefined -npm/npmjs/-/ajv/6.12.6, MIT, approved, #979 +npm/npmjs/-/ajv/6.12.6, MIT, approved, #15286 npm/npmjs/-/ansi-escapes/4.3.2, MIT, approved, clearlydefined npm/npmjs/-/ansi-regex/5.0.1, MIT, approved, clearlydefined npm/npmjs/-/ansi-styles/3.2.1, MIT, approved, clearlydefined @@ -59,7 +59,7 @@ npm/npmjs/-/chalk/2.4.2, MIT, approved, clearlydefined npm/npmjs/-/chalk/3.0.0, MIT, approved, clearlydefined npm/npmjs/-/chalk/4.1.2, MIT, approved, clearlydefined npm/npmjs/-/char-regex/1.0.2, MIT, approved, clearlydefined -npm/npmjs/-/chokidar/3.6.0, MIT, approved, #13197 +npm/npmjs/-/chokidar/3.6.0, MIT, approved, #15400 npm/npmjs/-/ci-info/3.9.0, MIT, approved, clearlydefined npm/npmjs/-/cjs-module-lexer/1.2.3, MIT, approved, #9069 npm/npmjs/-/classnames/2.5.1, MIT, approved, clearlydefined @@ -106,7 +106,7 @@ npm/npmjs/-/detect-newline/3.1.0, MIT, approved, clearlydefined npm/npmjs/-/diff-sequences/29.6.3, MIT, approved, clearlydefined npm/npmjs/-/diff/4.0.2, BSD-3-Clause, approved, #2728 npm/npmjs/-/dir-glob/3.0.1, MIT, approved, clearlydefined -npm/npmjs/-/doctrine/2.1.0, Apache-2.0 AND BSD-2-Clause, approved, #1987 +npm/npmjs/-/doctrine/2.1.0, Apache-2.0 AND BSD-2-Clause, approved, #15247 npm/npmjs/-/doctrine/3.0.0, Apache-2.0 AND BSD-2-Clause, approved, CQ22628 npm/npmjs/-/dom-accessibility-api/0.5.16, MIT, approved, clearlydefined npm/npmjs/-/dom-accessibility-api/0.6.3, MIT, approved, clearlydefined @@ -138,7 +138,7 @@ npm/npmjs/-/eslint-config-love/43.1.0, MIT, approved, #13906 npm/npmjs/-/eslint-config-prettier/9.1.0, MIT, approved, #11979 npm/npmjs/-/eslint-config-standard/17.1.0, MIT, approved, clearlydefined npm/npmjs/-/eslint-import-resolver-node/0.3.9, MIT, approved, #9923 -npm/npmjs/-/eslint-module-utils/2.8.1, MIT, approved, #8209 +npm/npmjs/-/eslint-module-utils/2.8.1, MIT, approved, #15235 npm/npmjs/-/eslint-plugin-es-x/7.6.0, MIT, approved, #14003 npm/npmjs/-/eslint-plugin-import/2.29.1, MIT, approved, #11187 npm/npmjs/-/eslint-plugin-n/16.6.2, MIT, approved, #12657 @@ -146,9 +146,9 @@ npm/npmjs/-/eslint-plugin-promise/6.1.1, ISC, approved, clearlydefined npm/npmjs/-/eslint-plugin-react-hooks/4.6.0, MIT, approved, clearlydefined npm/npmjs/-/eslint-plugin-react/7.34.1, MIT, approved, #13825 npm/npmjs/-/eslint-scope/7.2.2, BSD-2-Clause, approved, #9916 -npm/npmjs/-/eslint-visitor-keys/3.4.3, Apache-2.0, approved, #7729 -npm/npmjs/-/eslint/8.57.0, MIT AND ISC AND OFL-1.1 AND CC-BY-SA-2.0, approved, #13450 -npm/npmjs/-/espree/9.6.1, BSD-2-Clause AND BSD-3-Clause AND MIT AND BSD-2-Clause, approved, #9308 +npm/npmjs/-/eslint-visitor-keys/3.4.3, Apache-2.0, approved, #15274 +npm/npmjs/-/eslint/8.57.0, MIT AND ISC AND OFL-1.1 AND CC-BY-SA-2.0, approved, #15317 +npm/npmjs/-/espree/9.6.1, BSD-2-Clause AND BSD-3-Clause AND MIT AND BSD-2-Clause AND BSD-3-Clause AND MIT AND (BSD-2-Clause AND MIT) AND (BSD-3-Clause AND LGPL-2.0-or-later AND MIT) AND LGPL-2.1-or-later, approved, #15293 npm/npmjs/-/esprima/4.0.1, BSD-2-Clause, approved, #995 npm/npmjs/-/esquery/1.5.0, BSD-3-Clause, approved, #7469 npm/npmjs/-/esrecurse/4.3.0, BSD-2-Clause, approved, clearlydefined @@ -161,7 +161,7 @@ npm/npmjs/-/expect/29.7.0, MIT, approved, clearlydefined npm/npmjs/-/fast-deep-equal/3.1.3, MIT, approved, clearlydefined npm/npmjs/-/fast-glob/3.3.2, MIT, approved, #9307 npm/npmjs/-/fast-json-stable-stringify/2.1.0, MIT, approved, clearlydefined -npm/npmjs/-/fast-levenshtein/2.0.6, MIT, approved, #2428 +npm/npmjs/-/fast-levenshtein/2.0.6, MIT, approved, #15236 npm/npmjs/-/fastq/1.17.1, ISC, approved, clearlydefined npm/npmjs/-/fb-watchman/2.0.2, MIT AND Apache-2.0, approved, #5379 npm/npmjs/-/file-entry-cache/6.0.1, MIT, approved, clearlydefined @@ -176,7 +176,7 @@ npm/npmjs/-/follow-redirects/1.15.6, MIT, approved, #10782 npm/npmjs/-/for-each/0.3.3, MIT, approved, clearlydefined npm/npmjs/-/form-data/4.0.0, MIT, approved, clearlydefined npm/npmjs/-/fs.realpath/1.0.0, ISC, approved, clearlydefined -npm/npmjs/-/fsevents/2.3.3, MIT, approved, #2967 +npm/npmjs/-/fsevents/2.3.3, MIT, approved, #15309 npm/npmjs/-/function-bind/1.1.2, MIT, approved, #11063 npm/npmjs/-/function.prototype.name/1.1.6, MIT, approved, #10255 npm/npmjs/-/functions-have-names/1.2.3, MIT, approved, clearlydefined @@ -315,8 +315,8 @@ npm/npmjs/-/json-buffer/3.0.1, MIT, approved, clearlydefined npm/npmjs/-/json-parse-even-better-errors/2.3.1, MIT, approved, clearlydefined npm/npmjs/-/json-schema-traverse/0.4.1, MIT, approved, clearlydefined npm/npmjs/-/json-stable-stringify-without-jsonify/1.0.1, MIT, approved, clearlydefined -npm/npmjs/-/json5/1.0.2, MIT, approved, CQ22351 -npm/npmjs/-/json5/2.2.3, MIT, approved, #2126 +npm/npmjs/-/json5/1.0.2, MIT, approved, #15256 +npm/npmjs/-/json5/2.2.3, MIT, approved, #15226 npm/npmjs/-/jsx-ast-utils/3.3.5, MIT, approved, #9209 npm/npmjs/-/just-curry-it/5.3.0, MIT, approved, clearlydefined npm/npmjs/-/jwt-decode/4.0.0, MIT, approved, clearlydefined @@ -370,7 +370,7 @@ npm/npmjs/-/object-assign/4.1.1, MIT, approved, clearlydefined npm/npmjs/-/object-inspect/1.13.1, MIT, approved, #11078 npm/npmjs/-/object-is/1.1.6, MIT, approved, clearlydefined npm/npmjs/-/object-keys/1.1.1, MIT, approved, clearlydefined -npm/npmjs/-/object.assign/4.1.5, MIT, approved, #3232 +npm/npmjs/-/object.assign/4.1.5, MIT, approved, #15306 npm/npmjs/-/object.entries/1.1.8, MIT, approved, #4671 npm/npmjs/-/object.fromentries/2.0.8, MIT, approved, #4600 npm/npmjs/-/object.groupby/1.0.3, MIT, approved, #10360 @@ -439,7 +439,7 @@ npm/npmjs/-/react-toastify/10.0.5, MIT, approved, #13093 npm/npmjs/-/react-tooltip/5.26.3, MIT, approved, clearlydefined npm/npmjs/-/react-transition-group/4.4.5, BSD-3-Clause, approved, CQ22955 npm/npmjs/-/react/18.2.0, MIT, approved, clearlydefined -npm/npmjs/-/readdirp/3.6.0, MIT, approved, #2977 +npm/npmjs/-/readdirp/3.6.0, MIT, approved, #15328 npm/npmjs/-/redent/3.0.0, MIT, approved, clearlydefined npm/npmjs/-/reduce-reducers/1.0.4, MIT, approved, clearlydefined npm/npmjs/-/redux-actions/3.0.0, MIT, approved, clearlydefined @@ -458,7 +458,7 @@ npm/npmjs/-/resolve-from/5.0.0, MIT, approved, clearlydefined npm/npmjs/-/resolve-pathname/3.0.0, MIT, approved, clearlydefined npm/npmjs/-/resolve-pkg-maps/1.0.0, MIT, approved, clearlydefined npm/npmjs/-/resolve.exports/2.0.2, MIT, approved, clearlydefined -npm/npmjs/-/resolve/1.22.8, MIT AND ISC, approved, #2409 +npm/npmjs/-/resolve/1.22.8, MIT AND ISC, approved, #15315 npm/npmjs/-/resolve/2.0.0-next.5, MIT AND ISC, approved, #3078 npm/npmjs/-/reusify/1.0.4, MIT, approved, clearlydefined npm/npmjs/-/rimraf/3.0.2, ISC, approved, clearlydefined @@ -481,7 +481,7 @@ npm/npmjs/-/signal-exit/3.0.7, ISC, approved, #5892 npm/npmjs/-/sisteransi/1.0.5, MIT, approved, clearlydefined npm/npmjs/-/slash/3.0.0, MIT, approved, clearlydefined npm/npmjs/-/snake-case/3.0.4, MIT, approved, clearlydefined -npm/npmjs/-/source-map-js/1.2.0, BSD-3-Clause, approved, #13911 +npm/npmjs/-/source-map-js/1.2.0, BSD-3-Clause, approved, #15272 npm/npmjs/-/source-map-support/0.5.13, MIT, approved, clearlydefined npm/npmjs/-/source-map/0.5.7, BSD-3-Clause, approved, #2400 npm/npmjs/-/source-map/0.6.1, BSD-3-Clause, approved, #2417 @@ -547,7 +547,7 @@ npm/npmjs/-/v8-to-istanbul/9.2.0, ISC, approved, clearlydefined npm/npmjs/-/value-equal/1.0.1, MIT, approved, clearlydefined npm/npmjs/-/vite-plugin-svgr/4.2.0, MIT, approved, clearlydefined npm/npmjs/-/vite-tsconfig-paths/4.3.2, MIT, approved, clearlydefined -npm/npmjs/-/vite/5.2.9, MIT AND (ISC AND MIT) AND (Apache-2.0 AND BSD-2-Clause AND CC0-1.0 AND ISC AND MIT) AND (BSD-3-Clause AND MIT) AND ISC AND (BSD-2-Clause AND BSD-3-Clause), approved, #13953 +npm/npmjs/-/vite/5.2.9, MIT AND (ISC AND MIT) AND (Apache-2.0 AND BSD-2-Clause AND CC0-1.0 AND ISC AND MIT) AND (BSD-3-Clause AND MIT) AND ISC AND (BSD-2-Clause AND BSD-3-Clause), approved, #15411 npm/npmjs/-/void-elements/3.1.0, MIT, approved, clearlydefined npm/npmjs/-/w3c-xmlserializer/4.0.0, MIT, approved, clearlydefined npm/npmjs/-/walker/1.0.8, Apache-2.0, approved, clearlydefined @@ -633,7 +633,7 @@ npm/npmjs/@emotion/use-insertion-effect-with-fallbacks/1.0.1, MIT, approved, #84 npm/npmjs/@emotion/utils/1.2.1, MIT, approved, #8415 npm/npmjs/@emotion/weak-memoize/0.3.1, MIT, approved, #8402 npm/npmjs/@esbuild/aix-ppc64/0.20.2, MIT, approved, clearlydefined -npm/npmjs/@esbuild/android-arm/0.20.2, Apache-2.0 AND MIT AND BSD-3-Clause AND (BSD-2-Clause AND BSD-3-Clause), approved, #13952 +npm/npmjs/@esbuild/android-arm/0.20.2, Apache-2.0 AND MIT AND BSD-3-Clause AND (BSD-2-Clause AND BSD-3-Clause), approved, #15302 npm/npmjs/@esbuild/android-arm64/0.20.2, MIT, approved, clearlydefined npm/npmjs/@esbuild/android-x64/0.20.2, Apache-2.0 AND MIT AND BSD-3-Clause AND (BSD-2-Clause AND BSD-3-Clause), approved, #13954 npm/npmjs/@esbuild/darwin-arm64/0.20.2, MIT, approved, clearlydefined @@ -655,7 +655,7 @@ npm/npmjs/@esbuild/sunos-x64/0.20.2, MIT, approved, clearlydefined npm/npmjs/@esbuild/win32-arm64/0.20.2, MIT, approved, clearlydefined npm/npmjs/@esbuild/win32-ia32/0.20.2, MIT, approved, clearlydefined npm/npmjs/@esbuild/win32-x64/0.20.2, MIT, approved, clearlydefined -npm/npmjs/@eslint-community/eslint-utils/4.4.0, MIT, approved, #8032 +npm/npmjs/@eslint-community/eslint-utils/4.4.0, MIT, approved, #15285 npm/npmjs/@eslint-community/regexpp/4.10.0, MIT, approved, clearlydefined npm/npmjs/@eslint/eslintrc/2.1.4, MIT, approved, #9908 npm/npmjs/@eslint/js/8.57.0, MIT, approved, clearlydefined diff --git a/LICENSES/CC-BY-4.0.txt b/LICENSE_non-code similarity index 99% rename from LICENSES/CC-BY-4.0.txt rename to LICENSE_non-code index 4ea99c21..52665ed2 100644 --- a/LICENSES/CC-BY-4.0.txt +++ b/LICENSE_non-code @@ -1,4 +1,4 @@ -Attribution 4.0 International +Creative Commons Attribution 4.0 International ======================================================================= @@ -392,4 +392,4 @@ understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses. -Creative Commons may be contacted at creativecommons.org. +Creative Commons may be contacted at creativecommons.org. \ No newline at end of file diff --git a/NOTICE.md b/NOTICE.md index 4bdc4a17..9fa57ae0 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -12,12 +12,19 @@ source code repository logs. ## Declared Project Licenses -This program and the accompanying materials are made available under the terms -of the Apache License, Version 2.0 which is available at -https://www.apache.org/licenses/LICENSE-2.0. +The Tractus-X project uses the following licenses: +- Apache-2.0 for code +- CC-BY-4.0 for non-code + +Apache-2.0: +This program and the accompanying materials are made available under the terms of the Apache License, Version 2.0 which is available at https://www.apache.org/licenses/LICENSE-2.0. SPDX-License-Identifier: Apache-2.0 +CC-BY-4.0: +The materials in this repository are made available under the terms of the Creative Commons Attribution 4.0 International License, which is available at https://spdx.org/licenses/CC-BY-4.0.html. +SPDX-License-Identifier: CC-BY-4.0 + ## Source Code The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: From 544ea054e5bfd3c6fae6c4617e0c8bc5d812c088 Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Fri, 21 Jun 2024 15:46:33 +0200 Subject: [PATCH 3/3] chore(dev-flow): maintain latest changes in main branch (#198) * chore(dev-flow): maintain latest changes in main branch get rid of the dev branch https://github.com/eclipse-tractusx/portal/issues/243 --- .github/dependabot.yml | 3 --- .github/workflows/build.yml | 6 +++--- .github/workflows/dependencies.yaml | 2 +- .github/workflows/kics.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/{trivy-dev.yml => trivy-main.yml} | 6 +++--- 6 files changed, 9 insertions(+), 12 deletions(-) rename .github/workflows/{trivy-dev.yml => trivy-main.yml} (98%) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 487500a0..7da1e3e9 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -23,7 +23,6 @@ updates: # NPM - package-ecosystem: "npm" - target-branch: dev directory: / labels: - "dependabot" @@ -43,7 +42,6 @@ updates: # Github Actions - package-ecosystem: "github-actions" - target-branch: dev directory: / labels: - "dependabot" @@ -57,7 +55,6 @@ updates: # Docker - package-ecosystem: "docker" - target-branch: dev directory: ./.conf/ labels: - "dependabot" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8979139f..580c82cf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ name: build on: push: branches: - - 'dev' + - 'main' workflow_dispatch: env: @@ -80,7 +80,7 @@ jobs: with: images: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }} tags: | - type=raw,value=dev + type=raw,value=main type=raw,value=${{ github.sha }} - name: Build and push Docker image @@ -125,5 +125,5 @@ jobs: --url https://api.github.com/repos/eclipse-tractusx/portal/actions/workflows/portal-registration-image-update.yml/dispatches \ --header "authorization: Bearer $TOKEN" \ --header "Accept: application/vnd.github.v3+json" \ - --data '{"ref":"dev", "inputs": { "new-image":"${{ github.sha }}" }}' \ + --data '{"ref":"main", "inputs": { "new-image":"${{ github.sha }}" }}' \ --fail diff --git a/.github/workflows/dependencies.yaml b/.github/workflows/dependencies.yaml index ca2af351..16485d8c 100644 --- a/.github/workflows/dependencies.yaml +++ b/.github/workflows/dependencies.yaml @@ -21,7 +21,7 @@ name: Check Dependencies on: push: - branches: [main, dev] + branches: [main] pull_request: types: [opened, synchronize, reopened] workflow_dispatch: diff --git a/.github/workflows/kics.yml b/.github/workflows/kics.yml index d4532f10..83b90e7d 100644 --- a/.github/workflows/kics.yml +++ b/.github/workflows/kics.yml @@ -21,7 +21,7 @@ name: "KICS" on: push: - branches: [main, dev] + branches: [main] # pull_request: # The branches below must be a subset of the branches above # branches: [main, master] diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8bab83b6..9f5b7b91 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -170,7 +170,7 @@ jobs: if [[ ${{ steps.rc-check.outputs.rc }} == 'true' ]]; then echo "branch=release-candidate" >> $GITHUB_OUTPUT else - echo "branch=dev" >> $GITHUB_OUTPUT + echo "branch=main" >> $GITHUB_OUTPUT fi if: steps.hf-check.outputs.hf == 'false' diff --git a/.github/workflows/trivy-dev.yml b/.github/workflows/trivy-main.yml similarity index 98% rename from .github/workflows/trivy-dev.yml rename to .github/workflows/trivy-main.yml index 18eadcb4..c9ca0208 100644 --- a/.github/workflows/trivy-dev.yml +++ b/.github/workflows/trivy-main.yml @@ -20,11 +20,11 @@ # Depending on the location of your Docker container # you need to change the path to the specific Docker registry. # -name: "Trivy Dev" +name: "Trivy Main" on: push: - branches: [ dev ] + branches: [main] # pull_request: # The branches below must be a subset of the branches above # branches: [ main, master ] @@ -89,7 +89,7 @@ jobs: uses: aquasecurity/trivy-action@d710430a6722f083d3b36b8339ff66b32f22ee55 # v0.19.0 with: # Path to Docker image - image-ref: "${{ env.IMAGE_NAMESPACE}}/${{ env.IMAGE_NAME }}:dev" + image-ref: "${{ env.IMAGE_NAMESPACE}}/${{ env.IMAGE_NAME }}:main" format: "sarif" output: "trivy-results2.sarif" vuln-type: "os,library"