From 14bc2b16077b59367583e6ffac763af7f22920dd Mon Sep 17 00:00:00 2001 From: Lars Date: Sat, 1 Jun 2019 21:40:05 +0200 Subject: [PATCH 1/7] #63: Build Dockerfile in Azure Signed-off-by: Lars --- resources/Dockerfile => Dockerfile | 4 ++-- azure-pipelines.yml | 4 +++- codebase/ptm_backend/pom.xml | 3 ++- codebase/ptm_cli/pom.xml | 3 +-- 4 files changed, 8 insertions(+), 6 deletions(-) rename resources/Dockerfile => Dockerfile (58%) diff --git a/resources/Dockerfile b/Dockerfile similarity index 58% rename from resources/Dockerfile rename to Dockerfile index b8f94204..44e92d0d 100644 --- a/resources/Dockerfile +++ b/Dockerfile @@ -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"] diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e6eb5ddb..319f2586 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -29,4 +29,6 @@ steps: inputs: codeCoverageTool: 'jaCoCo' summaryFileLocation: 'target/codecoverage/jacoco.xml' - reportDirectory: 'target/codecoverage' \ No newline at end of file + reportDirectory: 'target/codecoverage' + +- script: docker build -t lgblaumeiser/ptm_backend . \ No newline at end of file diff --git a/codebase/ptm_backend/pom.xml b/codebase/ptm_backend/pom.xml index e2ac196f..1c7613da 100644 --- a/codebase/ptm_backend/pom.xml +++ b/codebase/ptm_backend/pom.xml @@ -13,7 +13,7 @@ ptm_backend 1.6-SNAPSHOT jar - + PTM Backend Backend server for Project Time Manager with web and rest interface @@ -69,6 +69,7 @@ + ptm org.springframework.boot diff --git a/codebase/ptm_cli/pom.xml b/codebase/ptm_cli/pom.xml index e292f799..39b92209 100644 --- a/codebase/ptm_cli/pom.xml +++ b/codebase/ptm_cli/pom.xml @@ -68,13 +68,12 @@ jar-with-dependencies false - + de.lgblaumeiser.ptm.cli.ProjectTimeManager - From 23ae526997b76b1b3c2fce249d63f560175362e6 Mon Sep 17 00:00:00 2001 From: Lars Date: Sat, 1 Jun 2019 21:52:38 +0200 Subject: [PATCH 2/7] #63: Add tag to docker build Signed-off-by: Lars --- azure-pipelines.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 319f2586..a0cc5e9d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -5,6 +5,9 @@ trigger: pool: vmImage: 'ubuntu-latest' +variables: + PTM.Version: 1.6 + steps: - task: Maven@3 inputs: @@ -31,4 +34,4 @@ steps: summaryFileLocation: 'target/codecoverage/jacoco.xml' reportDirectory: 'target/codecoverage' -- script: docker build -t lgblaumeiser/ptm_backend . \ No newline at end of file +- script: docker build -t lgblaumeiser/ptm_backend:$(PTM.Version)_$(Build.BuildNumber) . \ No newline at end of file From 5af0d3cf2467c04df42f1fce3247fbe17b72fe35 Mon Sep 17 00:00:00 2001 From: Lars Date: Sat, 1 Jun 2019 21:58:22 +0200 Subject: [PATCH 3/7] #63: Push container to docker hub Signed-off-by: Lars --- azure-pipelines.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a0cc5e9d..4c688f40 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -34,4 +34,8 @@ steps: summaryFileLocation: 'target/codecoverage/jacoco.xml' reportDirectory: 'target/codecoverage' -- script: docker build -t lgblaumeiser/ptm_backend:$(PTM.Version)_$(Build.BuildNumber) . \ No newline at end of file +- script: | + docker build -t lgblaumeiser/ptm_backend:$(PTM.Version)_$(Build.BuildNumber) . + docker login -u lgblaumeiser -p $(Docker.Passwd) https://hub.docker.com/ + docker push lgblaumeiser/ptm_backend:$(PTM.Version)_$(Build.BuildNumber) + \ No newline at end of file From 93a6b4450bdce177c5b509508ebf440525abd831 Mon Sep 17 00:00:00 2001 From: Lars Date: Sat, 1 Jun 2019 22:05:35 +0200 Subject: [PATCH 4/7] #63: Try other way with variables Signed-off-by: Lars --- azure-pipelines.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4c688f40..60bce03a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -36,6 +36,8 @@ steps: - script: | docker build -t lgblaumeiser/ptm_backend:$(PTM.Version)_$(Build.BuildNumber) . - docker login -u lgblaumeiser -p $(Docker.Passwd) https://hub.docker.com/ + docker login -u lgblaumeiser -p $(pswd) https://hub.docker.com/ docker push lgblaumeiser/ptm_backend:$(PTM.Version)_$(Build.BuildNumber) + env: + pswd: $(Docker.Passwd) \ No newline at end of file From b4d7623be1fef94c7d6ce5c05f1bac3f73b0b7be Mon Sep 17 00:00:00 2001 From: Lars Date: Sat, 1 Jun 2019 22:24:45 +0200 Subject: [PATCH 5/7] #63: New try with variables Signed-off-by: Lars --- azure-pipelines.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 60bce03a..4c688f40 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -36,8 +36,6 @@ steps: - script: | docker build -t lgblaumeiser/ptm_backend:$(PTM.Version)_$(Build.BuildNumber) . - docker login -u lgblaumeiser -p $(pswd) https://hub.docker.com/ + docker login -u lgblaumeiser -p $(Docker.Passwd) https://hub.docker.com/ docker push lgblaumeiser/ptm_backend:$(PTM.Version)_$(Build.BuildNumber) - env: - pswd: $(Docker.Passwd) \ No newline at end of file From a7da15664550142c8aba2879f5dc718a118388d2 Mon Sep 17 00:00:00 2001 From: Lars Date: Sat, 1 Jun 2019 22:32:45 +0200 Subject: [PATCH 6/7] #63: New variable name Signed-off-by: Lars --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4c688f40..da75b0b0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -7,7 +7,7 @@ pool: variables: PTM.Version: 1.6 - + steps: - task: Maven@3 inputs: @@ -36,6 +36,6 @@ steps: - script: | docker build -t lgblaumeiser/ptm_backend:$(PTM.Version)_$(Build.BuildNumber) . - docker login -u lgblaumeiser -p $(Docker.Passwd) https://hub.docker.com/ + docker login -u lgblaumeiser -p $(ptm.docker_pwd) https://hub.docker.com/ docker push lgblaumeiser/ptm_backend:$(PTM.Version)_$(Build.BuildNumber) \ No newline at end of file From 2dcd9f0b54fcc248edac08a9089795089a92c2d6 Mon Sep 17 00:00:00 2001 From: Lars Date: Sat, 1 Jun 2019 22:41:47 +0200 Subject: [PATCH 7/7] #63: Fix docker hub login Signed-off-by: Lars --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index da75b0b0..f9a35922 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -36,6 +36,6 @@ steps: - script: | docker build -t lgblaumeiser/ptm_backend:$(PTM.Version)_$(Build.BuildNumber) . - docker login -u lgblaumeiser -p $(ptm.docker_pwd) https://hub.docker.com/ + docker login -u lgblaumeiser -p $(ptm.docker_pwd) docker push lgblaumeiser/ptm_backend:$(PTM.Version)_$(Build.BuildNumber) \ No newline at end of file