From eb8415a2328ebca486c7b8c9d77857acab6eaa12 Mon Sep 17 00:00:00 2001 From: EC2 Default User Date: Sun, 29 Nov 2020 19:30:08 +0000 Subject: [PATCH 1/3] PR_5 --- .bash_history | 234 +++++++++++++++++++++ .bash_logout | 2 + .bash_profile | 12 ++ .bashrc | 11 + .docker/.buildNodeID | 1 + .ssh/authorized_keys | 1 + .viminfo | 391 ++++++++++++++++++++++++++++++++++++ PR_3/Marom | 1 + PR_4/JENKINS_ADMIN_ID | 1 + PR_4/JENKINS_ADMIN_PASSWORD | 1 + PR_4/casc.yml | 24 +++ PR_4/docker-ce.repo | 63 ++++++ PR_4/dockerfile | 26 +++ PR_4/plugins.txt | 81 ++++++++ PR_5 | 1 + 15 files changed, 850 insertions(+) create mode 100644 .bash_history create mode 100644 .bash_logout create mode 100644 .bash_profile create mode 100644 .bashrc create mode 100644 .docker/.buildNodeID create mode 100644 .ssh/authorized_keys create mode 100644 .viminfo create mode 160000 PR_3/Marom create mode 100644 PR_4/JENKINS_ADMIN_ID create mode 100644 PR_4/JENKINS_ADMIN_PASSWORD create mode 100644 PR_4/casc.yml create mode 100644 PR_4/docker-ce.repo create mode 100644 PR_4/dockerfile create mode 100644 PR_4/plugins.txt create mode 160000 PR_5 diff --git a/.bash_history b/.bash_history new file mode 100644 index 0000000..24de4b1 --- /dev/null +++ b/.bash_history @@ -0,0 +1,234 @@ +sudo yum update +yum install docker +su - +sudo yum install -q -y yum-utils +sudo yum-config-manager .--add-repo https://download.docker.com/linux/centos/docker-ce.repo +sudo yum install -q -y docker-ce docker-ce-cli containerd.io +sudo systemctl start --quiet docker +sudo yum install -q -y yum-utils +sudo yum-config-manager .--add-repo https://download.docker.com/linux/centos/docker-ce.repo +sudo yum install -q -y docker-ce docker-ce-cli containerd.io +sudo systemctl start --quiet docker +sudo systemctl enable docker +sudo systemctl status docker +docker +sudo yum install -y docker-ce docker-ce-cli containerd.io +sudo yum-config-manager .--add-repo https://download.docker.com/linux/centos/docker-ce.repo +sudo yum install -y docker-ce docker-ce-cli containerd.io +sudo yum install -y docker +sudo yum install -y docker-ce +docker +sudo systemctl start --quiet docker +sudo systemctl enable docker +sudo yum install -y -q git +sudo systemctl enable git +sudo yum install git +sudo systemctl enable git +git +mkdir git +cd git +git pull https://github.com/MaromGold/microblog.git +docker volume create jenkins-data +sudo docker volume create jenkins-data +sudo docker pull jenkins/jenkins:lts +docker build -t microblog:latest +pwd +ll +git pull https://github.com/MaromGold/microblog.git +git init +git pull https://github.com/MaromGold/microblog.git +ll +docker build -t microblog:latest +docker build -t microblog:latest . +sudo docker build -t microblog:latest . +sudo docker run --name microblog -d -p 8000:5000 --rm microblog:latest +docker ps +sudo docker ps +ls +cd .. +ls +rmdir -r git +rmdir -f git +rm -rf git +vi dockerfile +ls +docker ps +sudo docker ps +sudo docker run -d --privileged --name Marom -p 8080:8080 -v /var/run/docker.sock:/var/run/docker.sock 561338ac29c9 +sudo docker volume list +ls +pwd +vi plugins.txt +vi JENKINS_ADMIN_PASSWORD +vi JENKINS_ADMIN_ID +vi casc.yml +vi docker-ce.repo +ls +history | grep build +docker build -t JenkinsDocker . +docker build -t jenkinsdocker . +sudo docker build -t jenkinsdocker . +docker ps +sudo docker ps +docker image ls +sudo docker image ls +sudo docker volume list +netstat | grep 8080 +sudo docker run -d --privileged --name Jenkins -p 8080:8080 -v /var/run/docker.sock:/var/run/docker.sock jenkinsdocker +sudo docker ps +sudo docker stop --a +sudo docker stop 561338ac29c9 +sudo docker ps -a +sudo docker container ls +sudo docker ps +sudo docker stop 5ea3ecb5dd67 +sudo docker stop microblog-image +sudo docker ps +sudo docker stop microblog-image +sudo docker stop f9b1bd6e5daf +curl -s --cookie-jar /tmp/cookies -u admin:admin http://localhost:8080/crumbissuer/api/json +sudo yum update +ls +md PR_3 +mkdir PR_3 +git init +history | grep fork +git:latest +pwd +ls +cd PR_3/ +ls +git pull https://github.com/MaromGold/MG_PR.git +ls +cd .. +ls +cd PR_3/ +ls +ll +ls -la +git clone https://github.com/MaromGold/MG_PR.git +ls +cd MG_PR/ +ls +git branch +bit branch patch-4 +git branch patch-4 +git pull +ls +cd .. +ls +rm -rf MG_PR/ +git branch +git branch patch-4 +git branch +git switch patch-4 +git branch +git clone https://github.com/MaromGold/MG_PR.git +ls +ls MG_PR/ +git pull +git pull remote patch-4 +git remote show origin +git remote show master +git remote show MG_PR +git remote show MaromGold +git remote show +עןא נרשמבי +git branch +git branch patch-3 +git switch branch-3 +git switch patch-3 +git branch +ls +ren MG_PR/ Marom +mv MG_PR/ Marom +ls +cd Marom/ +ls +vi Jenkinsfile +which jenkins +yum list installed | grep jenkins +vi jenkins_install.sh +vi plugins.txt +ls +vi casc.yml +ls +git status +git add Jenkinsfile casc.yml jenkins_install.sh plugins.txt +git commit -m "EX_3" +git branch +git switch -b patch-4 +git branch patch-4 +git branch +git switch branch-4 +git switch patch-4 +git branch +git branch patch-3 +git switch patch-3 +git branch +git push origin patch-3 +git pull +git pull origin patch-3 +ls +ls Marom/ +cat Jenkinsfile +ls +mv Jenkinsfile Marom/ +mv plugins.txt Marom/ +mv casc.yml Marom/ +mv jenkins_install.sh Marom/ +ca nginx.sh +cat nginx.sh +ks +ls +mv nginx.sh Marom/ +cat ncdu.sh +mv ncdu.sh Marom/ +ls +cd Marom/ +ls +mkdir old +mv bootstrap.sh old/ +mv ncdu.sh old/ +mv nginx.sh old/ +ls +history +git push origin patch-3 +ls +git branch patch-4 +git switch patch-4 +ls +history | grep pull +git pull remote patch-4 +git pull origin patch-4 +ls +cd .. +ls +cd Marom/ +cd .. +mv nginx.sh Marom/ +mv bootstrap.sh Marom/ +cd Marom/ +ls +mkdir ex-3 +mv bootstrap.sh ex-3/ +mv casc.yml ex-3/ +mv jenkins_install.sh ex-3/ +ls +vi Dockerfile +ls +mv ncdu.sh old/ +mv nginx.sh old/ +ls +mv ex-3/casc.yml . +ls +cat Jenkinsfile +mv Jenkinsfile ex-3/ +vi Jenkinsfile +cp plugins.txt ex-3/ +vi plugins.txt +git status +git add Dockerfile Jenkinsfile casc.yml ex-3/ old/ plugins.txt +git commit -m "EX_4" +git push origin patch-4 +history diff --git a/.bash_logout b/.bash_logout new file mode 100644 index 0000000..af7c6fd --- /dev/null +++ b/.bash_logout @@ -0,0 +1,2 @@ +# ~/.bash_logout + diff --git a/.bash_profile b/.bash_profile new file mode 100644 index 0000000..031ab84 --- /dev/null +++ b/.bash_profile @@ -0,0 +1,12 @@ +# .bash_profile + +# Get the aliases and functions +if [ -f ~/.bashrc ]; then + . ~/.bashrc +fi + +# User specific environment and startup programs + +PATH=$PATH:$HOME/.local/bin:$HOME/bin + +export PATH diff --git a/.bashrc b/.bashrc new file mode 100644 index 0000000..1130779 --- /dev/null +++ b/.bashrc @@ -0,0 +1,11 @@ +# .bashrc + +# Source global definitions +if [ -f /etc/bashrc ]; then + . /etc/bashrc +fi + +# Uncomment the following line if you don't like systemctl's auto-paging feature: +# export SYSTEMD_PAGER= + +# User specific aliases and functions diff --git a/.docker/.buildNodeID b/.docker/.buildNodeID new file mode 100644 index 0000000..c14030a --- /dev/null +++ b/.docker/.buildNodeID @@ -0,0 +1 @@ +90494ce434ed9faa43f2b2b7e79dbb3ce1c35fa95a65aa5adcecc3622e2199c1 \ No newline at end of file diff --git a/.ssh/authorized_keys b/.ssh/authorized_keys new file mode 100644 index 0000000..7cc2420 --- /dev/null +++ b/.ssh/authorized_keys @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCQm/rudZ1gAtGt3EJtDqX+C+x5mRiNcv/rW2QRTo6Ejgv6VclSpfVtVjXbSwfnviDU2JPMTLNLEKLHhs7j96r72tsMks0kx2S3x+mUZwJTSaOTTpRACSBCV6VoHrP59pFiSCHQWVBvE0i8e3mSFJGrAxFr7iSbZDgdjxf3ZzYrSUJoBzVUPX2zyGA/U2gavAfGsvRVplWh2F8Fxql9DKxmogedt8I6cDhr+viC3UpRiOkkKKyQHC4br7NtwMPcet3emaCiF7/A3xlHol0CSbduGQWEVYvwGRzr8mcf9Aqb/M/Zz8hn6crhtXtnStzATulsvUtCZcDScD7vvTv8CT7J Marom diff --git a/.viminfo b/.viminfo new file mode 100644 index 0000000..b3afc8a --- /dev/null +++ b/.viminfo @@ -0,0 +1,391 @@ +# This viminfo file was generated by Vim 8.1. +# You may edit it if you're careful! + +# Viminfo version +|1,4 + +# Value of 'encoding' when this file was written +*encoding=utf-8 + + +# hlsearch on (H) or off (h): +~H +# Command Line History (newest to oldest): +:wq +|2,0,1606677971,,"wq" + +# Search String History (newest to oldest): + +# Expression History (newest to oldest): + +# Input Line History (newest to oldest): + +# Debug Line History (newest to oldest): + +# Registers: +""1 LINE 0 + ws-cleanup:latest +|3,1,1,1,1,0,1605620589,"ws-cleanup:latest" +"2 LINE 0 + workflow-support:latest +|3,0,2,1,1,0,1605620588,"workflow-support:latest" +"3 LINE 0 + workflow-step-api:latest +|3,0,3,1,1,0,1605620587,"workflow-step-api:latest" +"4 LINE 0 + workflow-scm-step:latest +|3,0,4,1,1,0,1605620587,"workflow-scm-step:latest" +"5 LINE 0 + workflow-multibranch:latest +|3,0,5,1,1,0,1605620587,"workflow-multibranch:latest" +"6 LINE 0 + workflow-job:latest +|3,0,6,1,1,0,1605620586,"workflow-job:latest" +"7 LINE 0 + workflow-durable-task-step:latest +|3,0,7,1,1,0,1605620586,"workflow-durable-task-step:latest" +"8 LINE 0 + workflow-cps-global-lib:latest +|3,0,8,1,1,0,1605620586,"workflow-cps-global-lib:latest" +"9 LINE 0 + workflow-cps:latest +|3,0,9,1,1,0,1605620586,"workflow-cps:latest" + +# File marks: +'0 25 30 ~/PR_5/docker-compose.yml +|4,48,25,30,1606677971,"~/PR_5/docker-compose.yml" +'1 43 0 ~/PR_5/docker-compose.yml +|4,49,43,0,1606677204,"~/PR_5/docker-compose.yml" +'2 43 0 ~/PR_5/docker-compose.yml +|4,50,43,0,1606677204,"~/PR_5/docker-compose.yml" +'3 6 25 ~/PR_3/Marom/Marom/plugins.txt +|4,51,6,25,1605620603,"~/PR_3/Marom/Marom/plugins.txt" +'4 22 0 ~/PR_3/Marom/Marom/Jenkinsfile +|4,52,22,0,1605620514,"~/PR_3/Marom/Marom/Jenkinsfile" +'5 21 1 ~/PR_3/Marom/Marom/Jenkinsfile +|4,53,21,1,1605620447,"~/PR_3/Marom/Marom/Jenkinsfile" +'6 21 1 ~/PR_3/Marom/Marom/Jenkinsfile +|4,54,21,1,1605620447,"~/PR_3/Marom/Marom/Jenkinsfile" +'7 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,55,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +'8 24 0 ~/PR_3/Marom/casc.yml +|4,56,24,0,1605612382,"~/PR_3/Marom/casc.yml" +'9 84 0 ~/PR_3/Marom/plugins.txt +|4,57,84,0,1605612263,"~/PR_3/Marom/plugins.txt" + +# Jumplist (newest first): +-' 25 30 ~/PR_5/docker-compose.yml +|4,39,25,30,1606677971,"~/PR_5/docker-compose.yml" +-' 43 0 ~/PR_5/docker-compose.yml +|4,39,43,0,1606677943,"~/PR_5/docker-compose.yml" +-' 43 0 ~/PR_5/docker-compose.yml +|4,39,43,0,1606677204,"~/PR_5/docker-compose.yml" +-' 1 0 ~/PR_5/docker-compose.yml +|4,39,1,0,1606677181,"~/PR_5/docker-compose.yml" +-' 1 0 ~/PR_5/docker-compose.yml +|4,39,1,0,1606677181,"~/PR_5/docker-compose.yml" +-' 6 25 ~/PR_3/Marom/Marom/plugins.txt +|4,39,6,25,1605620603,"~/PR_3/Marom/Marom/plugins.txt" +-' 6 25 ~/PR_3/Marom/Marom/plugins.txt +|4,39,6,25,1605620603,"~/PR_3/Marom/Marom/plugins.txt" +-' 6 25 ~/PR_3/Marom/Marom/plugins.txt +|4,39,6,25,1605620603,"~/PR_3/Marom/Marom/plugins.txt" +-' 6 25 ~/PR_3/Marom/Marom/plugins.txt +|4,39,6,25,1605620603,"~/PR_3/Marom/Marom/plugins.txt" +-' 1 0 ~/PR_3/Marom/Marom/plugins.txt +|4,39,1,0,1605620578,"~/PR_3/Marom/Marom/plugins.txt" +-' 1 0 ~/PR_3/Marom/Marom/plugins.txt +|4,39,1,0,1605620578,"~/PR_3/Marom/Marom/plugins.txt" +-' 1 0 ~/PR_3/Marom/Marom/plugins.txt +|4,39,1,0,1605620578,"~/PR_3/Marom/Marom/plugins.txt" +-' 1 0 ~/PR_3/Marom/Marom/plugins.txt +|4,39,1,0,1605620578,"~/PR_3/Marom/Marom/plugins.txt" +-' 22 0 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,22,0,1605620514,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 22 0 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,22,0,1605620514,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 22 0 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,22,0,1605620514,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 22 0 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,22,0,1605620514,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 22 0 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,22,0,1605620514,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 22 0 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,22,0,1605620514,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 22 0 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,22,0,1605620514,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 22 0 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,22,0,1605620514,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 21 1 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,21,1,1605620450,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 21 1 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,21,1,1605620450,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 21 1 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,21,1,1605620450,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 21 1 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,21,1,1605620450,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 21 1 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,21,1,1605620450,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 21 1 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,21,1,1605620450,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 21 1 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,21,1,1605620450,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 21 1 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,21,1,1605620450,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 21 1 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,21,1,1605620447,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 21 1 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,21,1,1605620447,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 21 1 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,21,1,1605620447,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 21 1 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,21,1,1605620447,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 21 1 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,21,1,1605620447,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 21 1 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,21,1,1605620447,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 21 1 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,21,1,1605620447,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 21 1 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,21,1,1605620447,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 1 0 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,1,0,1605620417,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 1 0 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,1,0,1605620417,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 1 0 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,1,0,1605620417,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 1 0 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,1,0,1605620417,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 1 0 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,1,0,1605620417,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 1 0 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,1,0,1605620417,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 1 0 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,1,0,1605620417,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 1 0 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,1,0,1605620417,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 1 0 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,1,0,1605620417,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 1 0 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,1,0,1605620417,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 1 0 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,1,0,1605620417,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 1 0 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,1,0,1605620417,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 1 0 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,1,0,1605620417,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 1 0 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,1,0,1605620417,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 1 0 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,1,0,1605620417,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 1 0 ~/PR_3/Marom/Marom/Jenkinsfile +|4,39,1,0,1605620417,"~/PR_3/Marom/Marom/Jenkinsfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 27 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,27,0,1605620265,"~/PR_3/Marom/Marom/Dockerfile" +-' 1 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,1,0,1605620242,"~/PR_3/Marom/Marom/Dockerfile" +-' 1 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,1,0,1605620242,"~/PR_3/Marom/Marom/Dockerfile" +-' 1 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,1,0,1605620242,"~/PR_3/Marom/Marom/Dockerfile" +-' 1 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,1,0,1605620242,"~/PR_3/Marom/Marom/Dockerfile" +-' 1 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,1,0,1605620242,"~/PR_3/Marom/Marom/Dockerfile" +-' 1 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,1,0,1605620242,"~/PR_3/Marom/Marom/Dockerfile" +-' 1 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,1,0,1605620242,"~/PR_3/Marom/Marom/Dockerfile" +-' 1 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,1,0,1605620242,"~/PR_3/Marom/Marom/Dockerfile" +-' 1 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,1,0,1605620242,"~/PR_3/Marom/Marom/Dockerfile" +-' 1 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,1,0,1605620242,"~/PR_3/Marom/Marom/Dockerfile" +-' 1 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,1,0,1605620242,"~/PR_3/Marom/Marom/Dockerfile" +-' 1 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,1,0,1605620242,"~/PR_3/Marom/Marom/Dockerfile" +-' 1 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,1,0,1605620242,"~/PR_3/Marom/Marom/Dockerfile" +-' 1 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,1,0,1605620242,"~/PR_3/Marom/Marom/Dockerfile" +-' 1 0 ~/PR_3/Marom/Marom/Dockerfile +|4,39,1,0,1605620242,"~/PR_3/Marom/Marom/Dockerfile" + +# History of marks within files (newest to oldest): + +> ~/PR_5/docker-compose.yml + * 1606677968 0 + " 25 30 + ^ 25 31 + . 25 30 + + 42 20 + + 43 0 + + 25 30 + +> ~/PR_3/Marom/Marom/plugins.txt + * 1605620599 0 + " 6 25 + ^ 6 26 + . 6 25 + + 1 10 + + 6 25 + +> ~/PR_3/Marom/Marom/Jenkinsfile + * 1605620513 0 + " 22 0 + ^ 22 0 + . 21 3 + + 21 3 + + 15 45 + + 18 30 + + 15 49 + + 22 0 + + 21 3 + +> ~/PR_3/Marom/Marom/Dockerfile + * 1605620262 0 + " 27 0 + ^ 27 0 + . 26 40 + + 26 39 + + 27 0 + + 26 40 + +> ~/PR_3/Marom/casc.yml + * 1605612378 0 + " 24 0 + ^ 24 0 + . 23 34 + + 23 34 + +> ~/PR_3/Marom/plugins.txt + * 1605612262 0 + " 84 0 + ^ 84 0 + . 83 17 + + 83 17 + +> ~/PR_3/Marom/jenkins_install.sh + * 1605612242 0 + " 38 0 + ^ 38 0 + . 37 2 + + 37 1 + + 1 0 + + 2 64 + + 24 0 + + 34 35 + + 37 2 + +> ~/PR_3/Marom/Jenkinsfile + * 1605611667 0 + " 20 0 + ^ 20 1 + . 20 0 + + 20 0 + +> ~/docker-ce.repo + * 1605033232 0 + " 63 0 + ^ 63 0 + . 62 51 + + 62 51 + +> ~/casc.yml + * 1605033211 0 + " 24 0 + ^ 24 0 + . 23 36 + + 23 36 + +> ~/JENKINS_ADMIN_ID + * 1605033184 0 + " 1 0 + ^ 1 1 + . 1 0 + + 1 0 + +> ~/JENKINS_ADMIN_PASSWORD + * 1605033170 0 + " 1 4 + ^ 1 5 + . 1 4 + + 1 4 + +> ~/plugins.txt + * 1605033141 0 + " 81 16 + ^ 81 17 + . 81 16 + + 81 16 + +> ~/dockerfile + * 1605032793 0 + " 26 39 + ^ 26 40 + . 26 39 + + 26 39 diff --git a/PR_3/Marom b/PR_3/Marom new file mode 160000 index 0000000..4c4724b --- /dev/null +++ b/PR_3/Marom @@ -0,0 +1 @@ +Subproject commit 4c4724b4639d1596f7ebb29d06f0301c8c656cef diff --git a/PR_4/JENKINS_ADMIN_ID b/PR_4/JENKINS_ADMIN_ID new file mode 100644 index 0000000..7fbe952 --- /dev/null +++ b/PR_4/JENKINS_ADMIN_ID @@ -0,0 +1 @@ +admin diff --git a/PR_4/JENKINS_ADMIN_PASSWORD b/PR_4/JENKINS_ADMIN_PASSWORD new file mode 100644 index 0000000..7fbe952 --- /dev/null +++ b/PR_4/JENKINS_ADMIN_PASSWORD @@ -0,0 +1 @@ +admin diff --git a/PR_4/casc.yml b/PR_4/casc.yml new file mode 100644 index 0000000..bfedba5 --- /dev/null +++ b/PR_4/casc.yml @@ -0,0 +1,24 @@ +--- +jenkins: + securityRealm: + local: + allowsSignup: false + users: + - id: ${JENKINS_ADMIN_ID} + password: ${JENKINS_ADMIN_PASSWORD} + authorizationStrategy: + globalMatrix: + permissions: + - "Overall/Administer:admin" + - "Overall/Read:authenticated" + remotingSecurity: + enabled: true +security: + queueItemAuthenticator: + authenticators: + - global: + strategy: triggeringUsersAuthorizationStrategy +unclassified: + location: + url: http://15.237.150.221:8080/ + diff --git a/PR_4/docker-ce.repo b/PR_4/docker-ce.repo new file mode 100644 index 0000000..f33d34e --- /dev/null +++ b/PR_4/docker-ce.repo @@ -0,0 +1,63 @@ +[docker-ce-stable] +name=Docker CE Stable - $basearch +baseurl=https://download.docker.com/linux/centos/$releasever/$basearch/stable +enabled=1 +gpgcheck=1 +gpgkey=https://download.docker.com/linux/centos/gpg + +[docker-ce-stable-debuginfo] +name=Docker CE Stable - Debuginfo $basearch +baseurl=https://download.docker.com/linux/centos/$releasever/debug-$basearch/stable +enabled=0 +gpgcheck=1 +gpgkey=https://download.docker.com/linux/centos/gpg + +[docker-ce-stable-source] +name=Docker CE Stable - Sources +baseurl=https://download.docker.com/linux/centos/$releasever/source/stable +enabled=0 +gpgcheck=1 +gpgkey=https://download.docker.com/linux/centos/gpg + +[docker-ce-test] +name=Docker CE Test - $basearch +baseurl=https://download.docker.com/linux/centos/$releasever/$basearch/test +enabled=0 +gpgcheck=1 +gpgkey=https://download.docker.com/linux/centos/gpg + +[docker-ce-test-debuginfo] +name=Docker CE Test - Debuginfo $basearch +baseurl=https://download.docker.com/linux/centos/$releasever/debug-$basearch/test +enabled=0 +gpgcheck=1 +gpgkey=https://download.docker.com/linux/centos/gpg + +[docker-ce-test-source] +name=Docker CE Test - Sources +baseurl=https://download.docker.com/linux/centos/$releasever/source/test +enabled=0 +gpgcheck=1 +gpgkey=https://download.docker.com/linux/centos/gpg + +[docker-ce-nightly] +name=Docker CE Nightly - $basearch +baseurl=https://download.docker.com/linux/centos/$releasever/$basearch/nightly +enabled=0 +gpgcheck=1 +gpgkey=https://download.docker.com/linux/centos/gpg + +[docker-ce-nightly-debuginfo] +name=Docker CE Nightly - Debuginfo $basearch +baseurl=https://download.docker.com/linux/centos/$releasever/debug-$basearch/nightly +enabled=0 +gpgcheck=1 +gpgkey=https://download.docker.com/linux/centos/gpg + +[docker-ce-nightly-source] +name=Docker CE Nightly - Sources +baseurl=https://download.docker.com/linux/centos/$releasever/source/nightly +enabled=0 +gpgcheck=1 +gpgkey=https://download.docker.com/linux/centos/gpg + diff --git a/PR_4/dockerfile b/PR_4/dockerfile new file mode 100644 index 0000000..82a3208 --- /dev/null +++ b/PR_4/dockerfile @@ -0,0 +1,26 @@ +FROM jenkins/jenkins:lts +USER root +RUN apt-get update && \ +apt-get -y install apt-transport-https \ + ca-certificates \ + curl \ + gnupg2 \ + software-properties-common && \ +curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg > /tmp/dkey; apt-key add /tmp/dkey && \ +add-apt-repository \ + "deb [arch=amd64] https://download.docker.com/linux/$(. /etc/os-release; echo "$ID") \ + $(lsb_release -cs) \ + stable" && \ +apt-get update && \ +apt-get -y install docker-ce +RUN apt-get install -y docker-ce +RUN groupmod -g 993 docker +RUN usermod -a -G docker jenkins +USER jenkins +ENV JAVA_OPTS -Djenkins.install.runSetupWizard=false +ENV CASC_JENKINS_CONFIG /var/jenkins_home/casc.yml +COPY JENKINS_ADMIN_ID /run/secrets/JENKINS_ADMIN_ID +COPY JENKINS_ADMIN_PASSWORD /run/secrets/JENKINS_ADMIN_PASSWORD +COPY plugins.txt /usr/share/jenkins/ref/plugins.txt +RUN /usr/local/bin/install-plugins.sh < /usr/share/jenkins/ref/plugins.txt +COPY casc.yml /var/jenkins_home/casc.yml diff --git a/PR_4/plugins.txt b/PR_4/plugins.txt new file mode 100644 index 0000000..e82355b --- /dev/null +++ b/PR_4/plugins.txt @@ -0,0 +1,81 @@ +configuration-as-code:latest +ace-editor:latest +ant:latest +antisamy-markup-formatter:latest +apache-httpcomponents-client-4-api:latest +authorize-project:latest +bootstrap4-api:latest +bouncycastle-api:latest +branch-api:latest +build-timeout:latest +checks-api:latest +cloudbees-folder:latest +command-launcher:latest +credentials:latest +credentials-binding:latest +display-url-api:latest +durable-task:latest +echarts-api:latest +email-ext:latest +font-awesome-api:latest +git:latest +git-client:latest +git-server:latest +github:latest +github-api:latest +github-branch-source:latest +github-oauth:latest +gradle:latest +handlebars:latest +jackson2-api:latest +jdk-tool:latest +jquery-detached:latest +jquery3-api:latest +jsch:latest +junit:latest +ldap:latest +lockable-resources:latest +mailer:latest +matrix-auth:latest +matrix-project:latest +momentjs:latest +okhttp-api:latest +pam-auth:latest +pipeline-build-step:latest +pipeline-github-lib:latest +pipeline-graph-analysis:latest +pipeline-input-step:latest +pipeline-milestone-step:latest +pipeline-model-api:latest +pipeline-model-definition:latest +pipeline-model-extensions:latest +pipeline-rest-api:latest +pipeline-stage-step:latest +pipeline-stage-tags-metadata:latest +pipeline-stage-view:latest +plain-credentials:latest +plugin-util-api:latest +popper-api:latest +python:latest +resource-disposer:latest +scm-api:latest +script-security:latest +snakeyaml-api:latest +ssh-credentials:latest +ssh-slaves:latest +structs:latest +timestamper:latest +token-macro:latest +trilead-api:latest +workflow-aggregator:latest +workflow-api:latest +workflow-basic-steps:latest +workflow-cps:latest +workflow-cps-global-lib:latest +workflow-durable-task-step:latest +workflow-job:latest +workflow-multibranch:latest +workflow-scm-step:latest +workflow-step-api:latest +workflow-support:latest +ws-cleanup:latest diff --git a/PR_5 b/PR_5 new file mode 160000 index 0000000..4158d3b --- /dev/null +++ b/PR_5 @@ -0,0 +1 @@ +Subproject commit 4158d3ba21b3657500e93c04fae74d016919ae8e From 449473a125b71a83cec10276bab32fcabb0019d7 Mon Sep 17 00:00:00 2001 From: MaromGold <37050783+MaromGold@users.noreply.github.com> Date: Sun, 6 Dec 2020 19:49:35 +0200 Subject: [PATCH 2/3] Update .buildNodeID --- .docker/.buildNodeID | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.docker/.buildNodeID b/.docker/.buildNodeID index c14030a..7359014 100644 --- a/.docker/.buildNodeID +++ b/.docker/.buildNodeID @@ -1 +1 @@ -90494ce434ed9faa43f2b2b7e79dbb3ce1c35fa95a65aa5adcecc3622e2199c1 \ No newline at end of file +>>KEY<< From 2ae9152604d2edaf2edf1a6279917a64fb76d7de Mon Sep 17 00:00:00 2001 From: MaromGold <37050783+MaromGold@users.noreply.github.com> Date: Sun, 6 Dec 2020 19:50:02 +0200 Subject: [PATCH 3/3] Update authorized_keys --- .ssh/authorized_keys | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ssh/authorized_keys b/.ssh/authorized_keys index 7cc2420..d319734 100644 --- a/.ssh/authorized_keys +++ b/.ssh/authorized_keys @@ -1 +1 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCQm/rudZ1gAtGt3EJtDqX+C+x5mRiNcv/rW2QRTo6Ejgv6VclSpfVtVjXbSwfnviDU2JPMTLNLEKLHhs7j96r72tsMks0kx2S3x+mUZwJTSaOTTpRACSBCV6VoHrP59pFiSCHQWVBvE0i8e3mSFJGrAxFr7iSbZDgdjxf3ZzYrSUJoBzVUPX2zyGA/U2gavAfGsvRVplWh2F8Fxql9DKxmogedt8I6cDhr+viC3UpRiOkkKKyQHC4br7NtwMPcet3emaCiF7/A3xlHol0CSbduGQWEVYvwGRzr8mcf9Aqb/M/Zz8hn6crhtXtnStzATulsvUtCZcDScD7vvTv8CT7J Marom +ssh-rsa ###KEY### Marom