Merge branch '#77-Persistence-Mapping-Fix' into 'dev'

#77 Fixed compose, added docs

See merge request team1/sandbox2!13
This commit is contained in:
Marvin Scham
2023-06-28 03:35:19 +00:00
5 changed files with 14 additions and 5 deletions

View File

@@ -1,5 +1,11 @@
# Changelog # Changelog
## 1.0.1
### Fixed
- Persistence mapping in Docker (#77)
## 1.0.0 ## 1.0.0
### Added ### Added

View File

@@ -21,7 +21,7 @@ RUN mvn -B package -DskipTests
FROM openjdk:17-jdk-slim FROM openjdk:17-jdk-slim
# Copy the jar file from the build stage # Copy the jar file from the build stage
COPY --from=build /app/target/easydrop-1.0.0.jar /easydrop.jar COPY --from=build /app/target/easydrop-1.0.1.jar /easydrop.jar
# Execute the application when the docker container starts. # Execute the application when the docker container starts.
ENTRYPOINT ["java", "-jar", "/easydrop.jar"] ENTRYPOINT ["java", "-jar", "/easydrop.jar"]

View File

@@ -1,6 +1,6 @@
# EasyDrop # EasyDrop
![Version](https://img.shields.io/badge/version-1.0.0-orange) ![Version](https://img.shields.io/badge/version-1.0.1-orange)
![Pipeline](https://gitlab.fbe-adswen.rwu.de/team1/sandbox2/badges/main/pipeline.svg) ![Pipeline](https://gitlab.fbe-adswen.rwu.de/team1/sandbox2/badges/main/pipeline.svg)
[![Coverage](https://sonar.fbe-adswen.rwu.de/api/project_badges/measure?project=de.rwu%3Aeasydrop&metric=coverage&token=sqb_2fe80aed361468170aaef32a0ff96d596456cdd1)](https://sonar.fbe-adswen.rwu.de/dashboard?id=de.rwu%3Aeasydrop) [![Coverage](https://sonar.fbe-adswen.rwu.de/api/project_badges/measure?project=de.rwu%3Aeasydrop&metric=coverage&token=sqb_2fe80aed361468170aaef32a0ff96d596456cdd1)](https://sonar.fbe-adswen.rwu.de/dashboard?id=de.rwu%3Aeasydrop)
![JAMANN](https://img.shields.io/badge/Auszahlung-Letzte%20Woche-brightgreen) ![JAMANN](https://img.shields.io/badge/Auszahlung-Letzte%20Woche-brightgreen)
@@ -22,6 +22,7 @@ Set up the required configuration files, use the corresponding demo files for or
- `config/config.properties` for API authorization - `config/config.properties` for API authorization
- `products-config.json` to define product catalogues to use for dropshipping - `products-config.json` to define product catalogues to use for dropshipping
- Run `touch persistence.db` to create a file to host the database
Create the container Create the container

View File

@@ -6,7 +6,9 @@ services:
build: build:
context: . context: .
dockerfile: Dockerfile dockerfile: Dockerfile
image: easydrop:1.0.0 image: easydrop:1.0.1
volumes: volumes:
- ./config:/config - ./config:/config
- ./persistence.db:/persistence.db - type: bind
source: ./persistence.db
target: /persistence.db

View File

@@ -5,7 +5,7 @@
<groupId>de.rwu</groupId> <groupId>de.rwu</groupId>
<artifactId>easydrop</artifactId> <artifactId>easydrop</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0.0</version> <version>1.0.1</version>
<name>EasyDrop</name> <name>EasyDrop</name>
<url>http://maven.apache.org</url> <url>http://maven.apache.org</url>