diff --git a/Makefile b/Makefile index 12b11ad..5c994d3 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,11 @@ build: - @docker-compose -p janus build; + @docker-compose build; run: - @docker-compose -p janus up -d + @docker-compose up -d stop: - @docker-compose -p janus down + @docker-compose down stop-clean-data: - @docker-compose -p janus down -v + @docker-compose 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 2409b89..f400ecd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,8 +16,8 @@ services: max-size: '4m' max-file: '10' networks: - - jenkins_net - - concordia_net + - janus_network + - concordia_network ports: - "80:80" - "443:443" @@ -43,8 +43,8 @@ services: max-size: '4m' max-file: '10' networks: - - jenkins_net - - concordia_net + - janus_network + - concordia_network volumes: - ./volumes/nginx/conf:/etc/nginx/conf.d - ./volumes/nginx/vhost:/etc/nginx/vhost.d @@ -60,18 +60,21 @@ services: build: dockerfile: ./Dockerfile context: ./jenkins - container_name: jenkins + image: ecentrics/janus + container_name: janus restart: always user: root env_file: - ./env/jenkins.env + ports: + - 8080:8080 secrets: - jenkins_admin_username - jenkins_admin_password - jenkins_dockerhub_username - jenkins_dockerhub_password networks: - - jenkins_net + - janus_network volumes: - ./volumes/jenkins/log:/var/log/jenkins - jenkins-data:/var/jenkins_home @@ -80,12 +83,12 @@ services: - janus-common:/mnt/janus/common # Networks in use -# TODO: maybe add/split to separate networks networks: - jenkins_net: + janus_network: driver: bridge - concordia_net: + concordia_network: driver: bridge + # Secrets in use secrets: jenkins_admin_username: