Skip to content

Commit

Permalink
Merge pull request eclipse-tractusx#153 from catenax-ng/DST_PIP9_ITR4
Browse files Browse the repository at this point in the history
pulling latest change from ITR4-pip9
  • Loading branch information
adityagajbhiye9 authored Jul 13, 2023
2 parents e13f510 + 265ed9a commit 7bc4e90
Show file tree
Hide file tree
Showing 26 changed files with 68 additions and 1,472 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/trivy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
uses: aquasecurity/trivy-action@master
with:
# Path to Docker image
image-ref: "ghcr.io/catenax-ng/tx-dft-backend:latest"
image-ref: "ghcr.io/catenax-ng/tx-managed-simple-data-exchanger-backend:latest"
format: "sarif"
output: "trivy-results.sarif"
exit-code: "1"
Expand Down
33 changes: 29 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,33 @@
# Changelog
All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [Unreleased]
- Support EDC version 4.1.
- Support EDC version 0.5.1
- Support AAS version 0.3

## [2.0.6] - 2023-07-12
### Added
- Renamed SerialPartTypization aspect submodel to SerialPart.
- Renamed AssemblyPartRelationship aspect submodel to SingleLevelBoMAsBuilt.
- Renamed AssemblyPartRelationship aspect submodel to SingleLevelBoMAsBuilt.

## [2.0.5] - 2023-07-12
### Added
- Support EDC version 4.1.

## [2.0.4] - 2023-07-12
### Fixed
- refactor EDC and de-centralized digital-twins api calls.

## [2.0.3] - 2023-07-12
### Added
- added umbrella charts for sde frontend and backend.
- removed the older charts.

### Fixed
- BPN discovery update.
- remove unwanted maven module.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
## [2.0.2] - 2023-06-21
### Added
- BPN Discovery service integration for DDTR.
Expand Down Expand Up @@ -146,7 +167,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Compliance with Catena-X Guidelines
- Integration with Digital Twin registry service.

[unreleased]: https://github.com/eclipse-tractusx/managed-simple-data-exchanger-backend/compare/dftbackend-2.0.2...main
[unreleased]: https://github.com/eclipse-tractusx/managed-simple-data-exchanger-backend/compare/dftbackend-2.0.6...main
[2.0.6]: https://github.com/eclipse-tractusx/managed-simple-data-exchanger-backend/compare/dftbackend-2.0.4...dftbackend-2.0.5
[2.0.5]: https://github.com/eclipse-tractusx/managed-simple-data-exchanger-backend/compare/dftbackend-2.0.4...dftbackend-2.0.5
[2.0.4]: https://github.com/eclipse-tractusx/managed-simple-data-exchanger-backend/compare/dftbackend-2.0.3...dftbackend-2.0.4
[2.0.3]: https://github.com/eclipse-tractusx/managed-simple-data-exchanger-backend/compare/dftbackend-2.0.2...dftbackend-2.0.3
[2.0.2]: https://github.com/eclipse-tractusx/managed-simple-data-exchanger-backend/compare/dftbackend-2.0.1...dftbackend-2.0.2
[2.0.1]: https://github.com/eclipse-tractusx/managed-simple-data-exchanger-backend/compare/dftbackend-2.0.0...dftbackend-2.0.1
[2.0.0]: https://github.com/eclipse-tractusx/dft-backend/compare/1.9.1...2.0.0
Expand Down
7 changes: 3 additions & 4 deletions build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ RUN mvn clean install

FROM eclipse-temurin:19-jdk-jammy

ARG USERNAME=dftuser
ARG USERNAME=sdeuser
ARG USER_UID=1001
ARG USER_GID=$USER_UID

# Create the user

RUN useradd -rm -d /home/dftuser -s /bin/bash -u $USER_UID -U $USERNAME
RUN useradd -rm -d /home/sdeuser -s /bin/bash -u $USER_UID -U $USERNAME


USER $USERNAME

# set deployment directory
WORKDIR /home/user/dftuser/dftapp
WORKDIR /home/user/sdeuser/sdeapp

# copy over the built artifact from the maven image

Expand All @@ -36,4 +36,3 @@ EXPOSE 8080
# set the startup command to run your binary

CMD ["java", "-jar", "./app.jar","--spring.config.location=file:/app/configuration.properties"]

202 changes: 0 additions & 202 deletions charts/LICENSE

This file was deleted.

Loading

0 comments on commit 7bc4e90

Please sign in to comment.