Browse Source

Fix docker-compose.yml, Add more Makefile targets

master
Apostolos Fanakis 5 years ago
parent
commit
a2b855a9fd
  1. 6
      Makefile
  2. 3
      docker-compose.yml

6
Makefile

@ -6,5 +6,11 @@ stop:
@docker-compose -p janus down @docker-compose -p janus down
stop-clean-data: stop-clean-data:
@docker-compose -p janus down -v @docker-compose -p janus down -v
copy-jobs:
@docker cp jenkins:/var/jenkins_home/jobs/. ./jenkins/jobs
update-plugins:
@docker exec -it jenkins ls /var/jenkins_home/plugins/ | grep -v jpi > ./jenkins/plugins.txt
print-ssh-key:
@docker exec -it jenkins cat "/home/jenkins/.ssh/gitlab-ssh.pub"
clean-images: clean-images:
@docker rmi `docker images -q -f "dangling=true"` @docker rmi `docker images -q -f "dangling=true"`

3
docker-compose.yml

@ -58,7 +58,8 @@ services:
# https://jenkins.io/doc/book/blueocean/ # https://jenkins.io/doc/book/blueocean/
jenkins: jenkins:
build: build:
dockerfile: ./jenkins dockerfile: ./jenkins/Dockerfile
context: ./jenkins
args: args:
HOST_DOCKER_VERSION: ${HOST_DOCKER_VERSION:-19.03.5} HOST_DOCKER_VERSION: ${HOST_DOCKER_VERSION:-19.03.5}
container_name: jenkins container_name: jenkins

Loading…
Cancel
Save