diff --git a/build.sh b/build.sh index 292ceb9e04244647c3d21c72890a77c733b42e1a..9430442030af1418d15b607eb7aec43ef166be09 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +./halt.sh docker-compose -f ./docker-compose_build.yml build docker-compose -f ./docker-compose_build.yml up diff --git a/docker-compose.yml b/docker-compose.yml index 96ef24184b3796099fe57f9fb2a81a7ae1f66db7..3902ae28d99a031ce64bb3d938e24bc5f48926a0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,10 @@ -backend: - container_name: backend - build: ./src/docker/run/ - volumes: - - ./target:/opt/portal/target - ports: - - "8080:8080" +version: '2' + +services: + backend: + container_name: backend + build: + context: . + dockerfile: ./src/docker/run/Dockerfile + ports: + - "8080:8080" diff --git a/docker-compose_build.yml b/docker-compose_build.yml index c30b2f11e4d06e47a9a381c8f267a7f405dd0c5d..b29bf59ecd0f6a068269bcc0fed3f0498bb9505d 100644 --- a/docker-compose_build.yml +++ b/docker-compose_build.yml @@ -1,8 +1,11 @@ -backend_build: - container_name: backend_build - build: ./src/docker/build/ - volumes: - - ./:/opt/portal/ - - .m2:/root/.m2/ - ports: - - "8080:8080" +version: '2' + +services: + backend_build: + container_name: backend_build + build: ./src/docker/build/ + volumes: + - ./:/opt/portal/ + - .m2:/root/.m2/ + ports: + - "8080:8080" diff --git a/log.sh b/log.sh new file mode 100755 index 0000000000000000000000000000000000000000..f1cd4924d74ad499aef9188c070880d2be956cf2 --- /dev/null +++ b/log.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +docker-compose logs -f backend diff --git a/pom.xml b/pom.xml index a9cb39f28e7cf809c411420afed6756ec9965b9e..f568cd0128ea345536e5df38c17c1eeb25ea59d8 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <groupId>org.hbp.mip</groupId> <artifactId>backend-services</artifactId> - <version>0.1.0</version> + <version>DOCKER_BUILD</version> <packaging>jar</packaging> <name>backend-services</name> diff --git a/src/docker/run/Dockerfile b/src/docker/run/Dockerfile index e709d55fec89e015e144f50a5ff178798979a1f5..61e0c7ee2580f256bfa049f91bb65d31f40350af 100644 --- a/src/docker/run/Dockerfile +++ b/src/docker/run/Dockerfile @@ -1,4 +1,4 @@ FROM frolvlad/alpine-oraclejdk8:slim -WORKDIR /opt/portal/target -CMD ["java", "-jar", "backend-services-0.1.0.jar"] +COPY ./target/backend-services-DOCKER_BUILD.jar backend.jar +CMD ["java", "-jar", "backend.jar"]