From a2b855a9fd4f44c9901010267d1e51f01b08f0df Mon Sep 17 00:00:00 2001
From: Apostolof <apotwohd@gmail.com>
Date: Sat, 9 May 2020 14:05:31 +0300
Subject: [PATCH] Fix docker-compose.yml, Add more Makefile targets

---
 Makefile           | 6 ++++++
 docker-compose.yml | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 640d627..846f115 100644
--- a/Makefile
+++ b/Makefile
@@ -6,5 +6,11 @@ stop:
 	@docker-compose -p janus down
 stop-clean-data:
 	@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:
 	@docker rmi `docker images -q -f "dangling=true"`
diff --git a/docker-compose.yml b/docker-compose.yml
index 7558534..da08cc8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -58,7 +58,8 @@ services:
   # https://jenkins.io/doc/book/blueocean/
   jenkins:
     build:
-      dockerfile: ./jenkins
+      dockerfile: ./jenkins/Dockerfile
+      context: ./jenkins
       args:
         HOST_DOCKER_VERSION: ${HOST_DOCKER_VERSION:-19.03.5}
     container_name: jenkins