Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: added updating of root folder dependencies #285

Closed
wants to merge 4 commits into from
Closed

feat: added updating of root folder dependencies #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b34c6fc
feat: added the integration of legal information to docker build work…
PaMarzec Mar 7, 2024
2d00d09
feat: removed NOTICE.md in build workflows and changed copy of legal …
PaMarzec Apr 16, 2024
18d6d4d
Merge branch 'main' into feat/update-root-folder-dependencies
PaMarzec Apr 16, 2024
dd2bd37
chore: updated backend dependencies
PaMarzec Apr 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .github/workflows/build-image-backend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,26 @@ env:
IMAGE_NAME: "app-puris-backend"

jobs:
# Copy legal information from root folder to backend container to fulfill TRG 7.05 requirements
# (https://eclipse-tractusx.github.io/docs/release/trg-7/trg-7-05/).
copy-legal-information:
if: github.repository_owner == 'eclipse-tractusx' # prevent running on forks
runs-on: ubuntu-latest
permissions:
packages: write

steps:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Copy and paste legal information
run: |
cp ./DEPENDENCIES_BACKEND ./backend/DEPENDENCIES
cp ./LICENSE ./backend/LICENSE
cp ./SECURITY.md ./backend/SECURITY.md
docker:
if: github.repository_owner == 'eclipse-tractusx' # prevent running on forks
needs: copy-legal-information # first needs to successfully do the "copy-legal-information" job
runs-on: ubuntu-latest
permissions:
packages: write
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/build-image-frontend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,26 @@ env:
IMAGE_NAME: "app-puris-frontend"

jobs:
# Copy legal information from root folder to frontend container to fulfill TRG 7.05 requirements
# (https://eclipse-tractusx.github.io/docs/release/trg-7/trg-7-05/).
copy-legal-information:
if: github.repository_owner == 'eclipse-tractusx' # prevent running on forks
runs-on: ubuntu-latest
permissions:
packages: write

steps:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Copy and paste legal information
run: |
cp ./DEPENDENCIES_FRONTEND ./frontend/DEPENDENCIES
cp ./LICENSE ./frontend/LICENSE
cp ./SECURITY.md ./frontend/SECURITY.md
docker:
if: github.repository_owner == 'eclipse-tractusx' # prevent running on forks
needs: copy-legal-information # first needs to successfully do the "copy-legal-information" job
runs-on: ubuntu-latest
permissions:
packages: write
Expand Down
6 changes: 3 additions & 3 deletions DEPENDENCIES_BACKEND
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ maven/mavencentral/org.assertj/assertj-core/3.24.2, Apache-2.0, approved, #6161
maven/mavencentral/org.awaitility/awaitility/4.2.0, Apache-2.0, approved, #14178
maven/mavencentral/org.checkerframework/checker-qual/3.42.0, MIT, approved, clearlydefined
maven/mavencentral/org.eclipse.angus/angus-activation/2.0.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.angus
maven/mavencentral/org.glassfish.jaxb/jaxb-core/4.0.4, BSD-3-Clause, approved, ee4j.jaxb
maven/mavencentral/org.glassfish.jaxb/jaxb-runtime/4.0.4, BSD-3-Clause, approved, ee4j.jaxb
maven/mavencentral/org.glassfish.jaxb/txw2/4.0.4, BSD-3-Clause, approved, ee4j.jaxb
maven/mavencentral/org.glassfish.jaxb/jaxb-core/4.0.4, BSD-3-Clause, approved, ee4j.jaxb-impl
maven/mavencentral/org.glassfish.jaxb/jaxb-runtime/4.0.4, BSD-3-Clause, approved, ee4j.jaxb-impl
maven/mavencentral/org.glassfish.jaxb/txw2/4.0.4, BSD-3-Clause, approved, ee4j.jaxb-impl
maven/mavencentral/org.hamcrest/hamcrest/2.2, BSD-3-Clause, approved, clearlydefined
maven/mavencentral/org.hibernate.common/hibernate-commons-annotations/6.0.6.Final, LGPL-2.1-only, approved, #6962
maven/mavencentral/org.hibernate.orm/hibernate-core/6.4.1.Final, LGPL-2.1-or-later AND (EPL-2.0 OR BSD-3-Clause) AND MIT, approved, #12490
Expand Down
6 changes: 3 additions & 3 deletions backend/DEPENDENCIES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ maven/mavencentral/org.assertj/assertj-core/3.24.2, Apache-2.0, approved, #6161
maven/mavencentral/org.awaitility/awaitility/4.2.0, Apache-2.0, approved, #14178
maven/mavencentral/org.checkerframework/checker-qual/3.42.0, MIT, approved, clearlydefined
maven/mavencentral/org.eclipse.angus/angus-activation/2.0.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.angus
maven/mavencentral/org.glassfish.jaxb/jaxb-core/4.0.4, BSD-3-Clause, approved, ee4j.jaxb
maven/mavencentral/org.glassfish.jaxb/jaxb-runtime/4.0.4, BSD-3-Clause, approved, ee4j.jaxb
maven/mavencentral/org.glassfish.jaxb/txw2/4.0.4, BSD-3-Clause, approved, ee4j.jaxb
maven/mavencentral/org.glassfish.jaxb/jaxb-core/4.0.4, BSD-3-Clause, approved, ee4j.jaxb-impl
maven/mavencentral/org.glassfish.jaxb/jaxb-runtime/4.0.4, BSD-3-Clause, approved, ee4j.jaxb-impl
maven/mavencentral/org.glassfish.jaxb/txw2/4.0.4, BSD-3-Clause, approved, ee4j.jaxb-impl
maven/mavencentral/org.hamcrest/hamcrest/2.2, BSD-3-Clause, approved, clearlydefined
maven/mavencentral/org.hibernate.common/hibernate-commons-annotations/6.0.6.Final, LGPL-2.1-only, approved, #6962
maven/mavencentral/org.hibernate.orm/hibernate-core/6.4.1.Final, LGPL-2.1-or-later AND (EPL-2.0 OR BSD-3-Clause) AND MIT, approved, #12490
Expand Down
3 changes: 3 additions & 0 deletions backend/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ RUN mvn dependency:go-offline
COPY src/ /app/src/
RUN mvn clean package -DskipTests

# Copy Legal information for distributions
COPY DOCKER_NOTICE.md README.md SECURITY.md* LICENSE* DEPENDENCIES* /opt/app/
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I missed that we also need the NOTICE.md. Please add.


FROM eclipse-temurin:17-jre-alpine
RUN mkdir /opt/app
COPY --from=build /app/target/*.jar /opt/app/puris-backend.jar
Expand Down
22 changes: 0 additions & 22 deletions backend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,27 +179,5 @@
</configuration>
</plugin>
</plugins>
<resources>
<!-- add basic application properties -->
<resource>
<directory>${project.basedir}/src/main/resources</directory>
<includes>
<include>application.properties</include>
</includes>
<targetPath>BOOT-INF/classes/</targetPath>
</resource>
<!-- add legal information to META-INF -->
<resource>
<directory>${project.basedir}/</directory>
<includes>
<include>README.md</include>
<include>LICENSE</include>
<include>NOTICE.md</include>
<include>DEPENDENCIES</include>
<include>SECURITY.md</include>
</includes>
<targetPath>META-INF</targetPath>
</resource>
</resources>
</build>
</project>
Loading