Skip to content
This repository has been archived by the owner on Nov 16, 2020. It is now read-only.

Commit

Permalink
still sortof crude, but might work
Browse files Browse the repository at this point in the history
  • Loading branch information
metas-ts committed May 5, 2017
1 parent 70c1b2b commit ec9d2a8
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 21 deletions.
13 changes: 11 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ currentBuild.displayName="#" + currentBuild.number + "-" + MF_UPSTREAM_BRANCH +

timestamps
{
node('agent && linux') // shall only run on a jenkins agent with linux
node('agent && linux && dejenkinsnode001') // shall only run on a jenkins agent with linux
{
stage('Preparation') // for display purposes
{
Expand Down Expand Up @@ -301,7 +301,16 @@ node('agent && linux') // shall only run on a jenkins agent with linux

stage('Build metasfresh-admin')
{
sh "mvn --settings $MAVEN_SETTINGS --file pom.xml --batch-mode -Dmaven.test.failure.ignore=true ${MF_MAVEN_TASK_RESOLVE_PARAMS} ${MF_MAVEN_TASK_DEPLOY_PARAMS} clean deploy docker:build -DpushImage"
//docker.withTool('default') {
//sh "mvn --settings $MAVEN_SETTINGS --file pom.xml --batch-mode -Dmaven.test.failure.ignore=true ${MF_MAVEN_TASK_RESOLVE_PARAMS} ${MF_MAVEN_TASK_DEPLOY_PARAMS} clean deploy docker:build -DpushImage"
sh "mvn --settings $MAVEN_SETTINGS --file pom.xml --batch-mode -Dmaven.test.failure.ignore=true ${MF_MAVEN_TASK_RESOLVE_PARAMS} ${MF_MAVEN_TASK_DEPLOY_PARAMS} clean deploy"
sh "cp target/metasfresh-admin-${BUILD_VERSION}.jar src/main/docker/de.metas.admin.webui-1.0.0.jar"

docker.withRegistry('https://index.docker.io/v1/', 'dockerhub_metasfresh')
{
def app = docker.build 'metasfresh/spring-boot-admin', 'src/main/docker';
app.push "${MF_UPSTREAM_BRANCH}-latest";
}
}
}
}
Expand Down
17 changes: 0 additions & 17 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,23 +71,6 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.4.11</version>
<configuration>
<imageName>${docker.image.prefix}/${project.artifactId}</imageName>
<dockerDirectory>src/main/docker</dockerDirectory>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>${project.build.directory}</directory>
<include>${project.build.finalName}.jar</include>
</resource>
</resources>
</configuration>
</plugin>
</plugins>
</build>
</project>
7 changes: 5 additions & 2 deletions src/main/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@

# the base image comes from "spring cloud in action"
# the rest mostly comes from https://spring.io/guides/gs/spring-boot-docker/
FROM openjdk:8-jdk-alpine
ADD de.metas.admin.webui-1.0.0.jar app.jar
ADD metasfresh-admin.jar metasfresh-admin.jar
RUN sh -c 'touch /app.jar'
ENV JAVA_OPTS=""
ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar /app.jar" ]
ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar /metasfresh-admin.jar" ]
2 changes: 2 additions & 0 deletions src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
# HTTP server (tomcat)
# --------------------------------------------------------------------------------
server.port=9090

spring.application.name=spring-boot-admin

0 comments on commit ec9d2a8

Please sign in to comment.