Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions resources/Dockerfile → Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@

FROM openjdk:8-jre
VOLUME /var/ptm
COPY ptm_backend-1.6.jar app.jar
ENTRYPOINT ["java","-Dptm.filestore=/var/ptm", "-jar","/app.jar"]
COPY codebase/ptm_backend/target/ptm.jar ptm.jar
ENTRYPOINT ["java","-Dptm.filestore=/var/ptm", "-jar","/ptm.jar"]
11 changes: 10 additions & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ trigger:
pool:
vmImage: 'ubuntu-latest'

variables:
PTM.Version: 1.6

steps:
- task: Maven@3
inputs:
Expand All @@ -29,4 +32,10 @@ steps:
inputs:
codeCoverageTool: 'jaCoCo'
summaryFileLocation: 'target/codecoverage/jacoco.xml'
reportDirectory: 'target/codecoverage'
reportDirectory: 'target/codecoverage'

- script: |
docker build -t lgblaumeiser/ptm_backend:$(PTM.Version)_$(Build.BuildNumber) .
docker login -u lgblaumeiser -p $(ptm.docker_pwd)
docker push lgblaumeiser/ptm_backend:$(PTM.Version)_$(Build.BuildNumber)

3 changes: 2 additions & 1 deletion codebase/ptm_backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<artifactId>ptm_backend</artifactId>
<version>1.6-SNAPSHOT</version>
<packaging>jar</packaging>

<name>PTM Backend</name>
<description>Backend server for Project Time Manager with web and rest interface</description>

Expand Down Expand Up @@ -69,6 +69,7 @@
</dependencies>

<build>
<finalName>ptm</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
Expand Down
3 changes: 1 addition & 2 deletions codebase/ptm_cli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,12 @@
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<appendAssemblyId>false</appendAssemblyId>
<!-- MainClass in mainfest make a executable jar -->
<!-- MainClass in manifest make a executable jar -->
<archive>
<manifest>
<mainClass>de.lgblaumeiser.ptm.cli.ProjectTimeManager</mainClass>
</manifest>
</archive>

</configuration>
<executions>
<execution>
Expand Down