diff --git a/build.sh b/build.sh index b39a2ed285e3711f6711b89f0a073b7429d6e520..7512161596e6f8d323de1f91792e3995caba3671 100755 --- a/build.sh +++ b/build.sh @@ -1,16 +1,11 @@ #!/bin/bash -e + if groups $USER | grep &>/dev/null '\bdocker\b'; then DOCKER_COMPOSE="docker-compose" else DOCKER_COMPOSE="sudo docker-compose" fi -# Create a symlink to the local Maven repository -[ -L .m2 ] || ln -s -t . ~/.m2 - -$DOCKER_COMPOSE --file=docker-compose.init.yml --project-name=portal-backend-init up - -echo "Need to set the current user as owner of the files generated in target directory..." -sudo chown -R $USER:$USER ./target +cp target/mip.jar src/docker/build/ -echo "Done" +$DOCKER_COMPOSE build diff --git a/run.sh b/run.sh index 13c4f109ab2583c34c067a18ab97f064534c9e9b..3483bbcfcb1c7446b56537d6792375c48896efe9 100755 --- a/run.sh +++ b/run.sh @@ -1,9 +1,20 @@ #!/bin/bash -e +# Run the backend in a Docker container and start the database. +# The current project is compiler inside the Docker container + if groups $USER | grep &>/dev/null '\bdocker\b'; then DOCKER_COMPOSE="docker-compose" else DOCKER_COMPOSE="sudo docker-compose" fi -$DOCKER_COMPOSE up +# Create a symlink to the local Maven repository +[ -L .m2 ] || ln -s -t . ~/.m2 + +$DOCKER_COMPOSE --file=docker-compose.init.yml --project-name=portal-backend-init up + +echo "Need to set the current user as owner of the files generated in target directory..." +sudo chown -R $USER:$USER ./target + +echo "Done" diff --git a/src/docker/build/.gitignore b/src/docker/build/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..d392f0e82c4ac6dd2e7bb17eb9253e1b30d07105 --- /dev/null +++ b/src/docker/build/.gitignore @@ -0,0 +1 @@ +*.jar diff --git a/src/docker/build/Dockerfile b/src/docker/build/Dockerfile index c2a4425b184734b846fa9cec9a2e9d04fee158a8..1369edf76009678d08db82e5e5ce87ef7b829f85 100644 --- a/src/docker/build/Dockerfile +++ b/src/docker/build/Dockerfile @@ -7,6 +7,7 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/v0.2.0/dockerize RUN tar -C /usr/local/bin -xzvf dockerize-linux-amd64-v0.2.0.tar.gz COPY mip.sh /opt/portal/ +COPY mip.jar /opt/portal/lib/ RUN chmod +x /opt/portal/mip.sh EXPOSE 8080