一、git端操作
#创建git仓库
mkdir java-demo.git
[git@git ~]$ cd java-demo.git/
[git@git java-demo.git]$ git --bare init
Initialized empty Git repository in /home/git/java-demo.git/
[git@git java-demo.git]$ exit
#Git客户端克隆Git仓库
it clone git@49.232.149.234:/home/git/java-demo.git
Cloning into 'java-demo'...
git@49.232.149.234's password:
warning: You appear to have cloned an empty repository.
[root@git ~]# ls
java-demo
#克隆一个GitHub上项目作为测试代码
git clone https://github.com/psi-probe/psi-probe
ls
java-demo psi-probe
[root@git ~]# cp -fr psi-probe/* java-demo/
[root@git ~]# git config --global user.email "jialiang@163.com"
[root@git ~]# git config --global user.user "jialiang"
[root@git ~]# cd java-demo/
[root@git java-demo]# git add .
[root@git java-demo]# git commit -m "all probe"
#创建版本号
git tag 1.0.0
[root@git java-demo]# git push origin master 1.0.0 #根据版本号上传1.0.0
#上传版本1.0.1
echo "222222" > 2.txt
[root@git java-demo]# git add .
[root@git java-demo]# git commit -m "all probe2"
[master f7f1ccb] all probe2
1 file changed, 1 insertion(+)
create mode 100644 2.txt
[root@git java-demo]# git tag 1.0.1
[root@git java-demo]# git push origin master 1.0.1
二、web主机配置
#将密钥对发给jenkins主机,要下载jenkins中的war包
ssh-copy-id 106.12.60.72
三、jenkins传递密钥对
su -s /bin/bash jenkins
ssh-keygen
ssh-copy-id git@49.232.149.234
四、jenkins配置
target/dist/**/*
/usr/local/tomcat/webapps/
/usr/local/tomcat/bin/shutdown.sh
rm -fr /usr/local/tomcat/webapps/probe.war
rm -fr /usr/local/tomcat/webapps/probe
scp 106.12.60.72:/var/lib/jenkins/workspace/java/web/target/probe.war /usr/local/tomcat/webapps/
/usr/local/tomcat/bin/startup.sh
六、PHP代码上线
-
git服务端操作
-
git客户端操作
git clone git@49.232.149.234:/home/git/php.git
[root@git ~]# ls
java-demo php psi-probe
cd php/
echo "1111" > index.php
git add .
git commit -m "all 1"
[master (root-commit) 1bbb0b0] all 1
1 file changed, 1 insertion(+)
create mode 100644 index.php
#代码版本1.0.0
git tag 1.0.0
git push origin master 1.0.0
git@49.232.149.234's password:
Counting objects: 3, done.
Writing objects: 100% (3/3), 204 bytes | 0 bytes/s, done.
Total 3 (delta 0), reused 0 (delta 0)
To git@49.232.149.234:/home/git/php.git
* [new branch] master -> master
* [new tag] 1.0.0 -> 1.0.0
#代码版本1.0.1
echo "22222" > php.php
[root@git php]# git add .
[root@git php]# git commit -m "all 2"
[master 06e0a5c] all 2
1 file changed, 1 insertion(+)
create mode 100644 php.php
[root@git php]# git tag 1.0.1
[root@git php]# git push origin master 1.0.1
git@49.232.149.234's password:
Counting objects: 4, done.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 261 bytes | 0 bytes/s, done.
Total 3 (delta 0), reused 0 (delta 0)
To git@49.232.149.234:/home/git/php.git
1bbb0b0..06e0a5c master -> master
* [new tag] 1.0.1 -> 1.0.1
-
打通jenkins与git和web的通道
-
配置jenkins
-
查看结果
cd /var/www/html/
ls
index.php
访问测试
- 测试版本1.0.1
[root@fengling html]# ls
index.php php.php
-
回滚测试