-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into RSWW-49-Dodać-10-przykładowych-userów
- Loading branch information
Showing
31 changed files
with
703 additions
and
98 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
name: Travel API CI - Hotel service | ||
|
||
on: | ||
push: | ||
branches: [ "dev" ] | ||
paths: | ||
- 'hotel-service/**' | ||
pull_request: | ||
branches: [ "dev" ] | ||
paths: | ||
- 'hotel-service/**' | ||
|
||
permissions: write-all | ||
|
||
jobs: | ||
test: | ||
name: Package and execute tests | ||
runs-on: ubuntu-latest | ||
if: always() | ||
|
||
steps: | ||
- uses: actions/checkout@v3 | ||
- name: Set up JDK 21 | ||
uses: actions/setup-java@v3 | ||
with: | ||
java-version: '21' | ||
distribution: 'zulu' | ||
cache: maven | ||
- name: Build transport-service | ||
run: mvn -B package --file hotel-service/pom.xml | ||
|
||
- name: transport-service test reports | ||
uses: EnricoMi/publish-unit-test-result-action@v2 | ||
if: always() | ||
with: | ||
files: | | ||
hotel-service/target/surefire-reports/TEST-*.xml | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
name: Travel API CI - Transport service | ||
|
||
on: | ||
push: | ||
branches: [ "dev" ] | ||
paths: | ||
- 'transport-service/**' | ||
pull_request: | ||
branches: [ "dev" ] | ||
paths: | ||
- 'transport-service/**' | ||
|
||
permissions: write-all | ||
|
||
jobs: | ||
test: | ||
name: Package and execute tests | ||
runs-on: ubuntu-latest | ||
if: always() | ||
|
||
steps: | ||
- uses: actions/checkout@v3 | ||
- name: Set up JDK 21 | ||
uses: actions/setup-java@v3 | ||
with: | ||
java-version: '21' | ||
distribution: 'zulu' | ||
cache: maven | ||
- name: Build transport-service | ||
run: mvn -B package --file transport-service/pom.xml | ||
|
||
- name: transport-service test reports | ||
uses: EnricoMi/publish-unit-test-result-action@v2 | ||
if: always() | ||
with: | ||
files: | | ||
transport-service/target/surefire-reports/TEST-*.xml | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,11 @@ | ||
# syntax=docker/dockerfile:1 | ||
|
||
FROM jelastic/maven:3.9.5-openjdk-21 AS build | ||
|
||
ENV HOME=/usr/app | ||
RUN mkdir -p $HOME | ||
WORKDIR $HOME | ||
ADD . $HOME | ||
|
||
RUN --mount=type=cache,target=/root/.m2 mvn clean package -Dmaven.test.skip | ||
|
||
|
||
FROM openjdk:21 | ||
|
||
ARG JAR_FILE=/usr/app/target/*.jar | ||
COPY --from=build $JAR_FILE /app/runner.jar | ||
|
||
ENTRYPOINT java -jar /app/runner.jar |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,11 @@ | ||
# syntax=docker/dockerfile:1 | ||
|
||
FROM jelastic/maven:3.9.5-openjdk-21 AS build | ||
|
||
ENV HOME=/usr/app | ||
RUN mkdir -p $HOME | ||
WORKDIR $HOME | ||
ADD . $HOME | ||
|
||
RUN --mount=type=cache,target=/root/.m2 mvn clean package -Dmaven.test.skip | ||
|
||
|
||
FROM openjdk:21 | ||
|
||
ARG JAR_FILE=/usr/app/target/*.jar | ||
COPY --from=build $JAR_FILE /app/runner.jar | ||
|
||
ENTRYPOINT java -jar /app/runner.jar |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
version: '3.9' | ||
name: mcarchvsc | ||
|
||
services: | ||
db: | ||
image: postgres | ||
environment: | ||
POSTGRES_USER: admin | ||
POSTGRES_PASSWORD: admin | ||
POSTGRES_DB: database | ||
PGDATA: /data/postgres | ||
volumes: | ||
- postgres:/data/postgres | ||
ports: | ||
- "5432:5432" | ||
restart: unless-stopped | ||
networks: | ||
- backend | ||
healthcheck: | ||
test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"] | ||
interval: 5s | ||
timeout: 5s | ||
retries: 20 | ||
|
||
volumes: | ||
postgres: | ||
|
||
networks: | ||
backend: | ||
name: mcarchvsc_backend | ||
external: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,11 @@ | ||
# syntax=docker/dockerfile:1 | ||
|
||
FROM jelastic/maven:3.9.5-openjdk-21 AS build | ||
|
||
ENV HOME=/usr/app | ||
RUN mkdir -p $HOME | ||
WORKDIR $HOME | ||
ADD . $HOME | ||
|
||
RUN --mount=type=cache,target=/root/.m2 mvn clean package -Dmaven.test.skip | ||
|
||
|
||
FROM openjdk:21 | ||
|
||
ARG JAR_FILE=/usr/app/target/*.jar | ||
COPY --from=build $JAR_FILE /app/runner.jar | ||
|
||
ENTRYPOINT java -jar /app/runner.jar |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,11 @@ | ||
# syntax=docker/dockerfile:1 | ||
|
||
FROM jelastic/maven:3.9.5-openjdk-21 AS build | ||
|
||
ENV HOME=/usr/app | ||
RUN mkdir -p $HOME | ||
WORKDIR $HOME | ||
ADD . $HOME | ||
|
||
RUN --mount=type=cache,target=/root/.m2 mvn clean package -Dmaven.test.skip | ||
|
||
|
||
FROM openjdk:21 | ||
|
||
ARG JAR_FILE=/usr/app/target/*.jar | ||
COPY --from=build $JAR_FILE /app/runner.jar | ||
|
||
ENTRYPOINT java -jar /app/runner.jar |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,11 @@ | ||
# syntax=docker/dockerfile:1 | ||
|
||
FROM jelastic/maven:3.9.5-openjdk-21 AS build | ||
|
||
ENV HOME=/usr/app | ||
RUN mkdir -p $HOME | ||
WORKDIR $HOME | ||
ADD . $HOME | ||
|
||
RUN --mount=type=cache,target=/root/.m2 mvn clean package -Dmaven.test.skip | ||
|
||
|
||
FROM openjdk:21 | ||
|
||
ARG JAR_FILE=/usr/app/target/*.jar | ||
COPY --from=build $JAR_FILE /app/runner.jar | ||
|
||
ENTRYPOINT java -jar /app/runner.jar |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,11 @@ | ||
# syntax=docker/dockerfile:1 | ||
|
||
FROM jelastic/maven:3.9.5-openjdk-21 AS build | ||
|
||
ENV HOME=/usr/app | ||
RUN mkdir -p $HOME | ||
WORKDIR $HOME | ||
ADD . $HOME | ||
|
||
RUN --mount=type=cache,target=/root/.m2 mvn clean package -Dmaven.test.skip | ||
|
||
|
||
FROM openjdk:21 | ||
|
||
ARG JAR_FILE=/usr/app/target/*.jar | ||
COPY --from=build $JAR_FILE /app/runner.jar | ||
|
||
ENTRYPOINT java -jar /app/runner.jar |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,11 @@ | ||
# syntax=docker/dockerfile:1 | ||
|
||
FROM jelastic/maven:3.9.5-openjdk-21 AS build | ||
|
||
ENV HOME=/usr/app | ||
RUN mkdir -p $HOME | ||
WORKDIR $HOME | ||
ADD . $HOME | ||
|
||
RUN --mount=type=cache,target=/root/.m2 mvn clean package -Dmaven.test.skip | ||
|
||
|
||
FROM openjdk:21 | ||
|
||
ARG JAR_FILE=/usr/app/target/*.jar | ||
COPY --from=build $JAR_FILE /app/runner.jar | ||
|
||
ENTRYPOINT java -jar /app/runner.jar |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.