diff --git a/Makefile b/Makefile index 5c994d3..f975d78 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,11 @@ build: - @docker-compose build; + @docker-compose -p ecentrics build; run: - @docker-compose up -d + @docker-compose -p ecentrics up -d stop: - @docker-compose down + @docker-compose -p ecentrics down stop-clean-data: - @docker-compose down -v + @docker-compose -p ecentrics down -v copy-jobs: @docker cp jenkins:/var/jenkins_home/jobs/. ./jenkins/jobs update-plugins: diff --git a/docker-compose.yml b/docker-compose.yml index f400ecd..539b44f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -77,10 +77,10 @@ services: - janus_network volumes: - ./volumes/jenkins/log:/var/log/jenkins - - jenkins-data:/var/jenkins_home + - jenkins_data:/var/jenkins_home - ./jenkins/downloads:/var/jenkins_home/downloads - /var/run/docker.sock:/var/run/docker.sock - - janus-common:/mnt/janus/common + - janus_common:/mnt/janus/common # Networks in use networks: @@ -100,5 +100,5 @@ secrets: jenkins_dockerhub_password: file: ./jenkins/secrets/dockerhubPassword volumes: - jenkins-data: - janus-common: + jenkins_data: + janus_common: