diff --git a/.travis.yml b/.travis.yml index 9b0013b..e99757e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,6 @@ env: - TMX_DOCKER_IMAGE=johncarnell/tmx-simple-service:chapter1 script: - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD -- mvn clean package docker:build +- mvn clean package - docker push $TMX_DOCKER_IMAGE - ecs-cli --version diff --git a/README.md b/README.md index a4f4d17..2d44e61 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ To build the code examples for Chapter 1 as a docker image, open a command-line Run the following maven command. This command will execute the [Spotify docker plugin](https://github.com/spotify/docker-maven-plugin) defined in the pom.xml file. - **mvn clean package docker:build** + **mvn clean package** If everything builds successfully you should see a message indicating that the build was successful. diff --git a/simpleservice/Dockerfile b/simpleservice/Dockerfile index 2e33032..01be86f 100644 --- a/simpleservice/Dockerfile +++ b/simpleservice/Dockerfile @@ -2,7 +2,8 @@ FROM openjdk:8-jdk-alpine RUN apk update && apk upgrade && apk add netcat-openbsd RUN mkdir -p /usr/local/simple-service -ADD target/simple-service-0.0.1-SNAPSHOT.jar /usr/local/simple-service +ARG JAR_FILE +ADD target/${JAR_FILE} /usr/local/simple-service ADD src/main/docker/run.sh run.sh RUN chmod +x run.sh CMD ./run.sh diff --git a/simpleservice/pom.xml b/simpleservice/pom.xml index e99f5dd..c93a329 100644 --- a/simpleservice/pom.xml +++ b/simpleservice/pom.xml @@ -42,7 +42,7 @@ com.spotify dockerfile-maven-plugin - 1.3.4 + 1.3.7 default @@ -59,6 +59,9 @@ ${docker.image.name} ${docker.image.tag} + + ${project.build.finalName}.jar +