From 1084c27873f42948f7df684be25800c99aa7a187 Mon Sep 17 00:00:00 2001 From: Leooooooo1234 <112930123+Leooooooo1234@users.noreply.github.com> Date: Mon, 20 Nov 2023 19:55:36 +0800 Subject: [PATCH 01/14] 1 --- dasedevops_spring_demo/gateway/dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 dasedevops_spring_demo/gateway/dockerfile diff --git a/dasedevops_spring_demo/gateway/dockerfile b/dasedevops_spring_demo/gateway/dockerfile new file mode 100644 index 0000000..db303b6 --- /dev/null +++ b/dasedevops_spring_demo/gateway/dockerfile @@ -0,0 +1,6 @@ +FROM openjdk:8 +MAINTAINER ningzhicheng +VOLUME /tmp +ADD ./target/*.jar /gateway.jar +ENTRYPOINT ["java","-jar","/gateway.jar"] +EXPOSE 8080 \ No newline at end of file From 39f5685f5f0a153af161b508aa3f7378b4cf56fb Mon Sep 17 00:00:00 2001 From: Leooooooo1234 <112930123+Leooooooo1234@users.noreply.github.com> Date: Mon, 20 Nov 2023 19:56:04 +0800 Subject: [PATCH 02/14] 2 --- dasedevops_spring_demo/hello/dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 dasedevops_spring_demo/hello/dockerfile diff --git a/dasedevops_spring_demo/hello/dockerfile b/dasedevops_spring_demo/hello/dockerfile new file mode 100644 index 0000000..c02774f --- /dev/null +++ b/dasedevops_spring_demo/hello/dockerfile @@ -0,0 +1,6 @@ +FROM openjdk:8 +MAINTAINER ningzhicheng +VOLUME /tmp +ADD ./target/*.jar /hello.jar +ENTRYPOINT ["java","-jar","/hello.jar"] +EXPOSE 8001 \ No newline at end of file From 28d6913e28c1d325f941a7b6b51a1b16ed46025b Mon Sep 17 00:00:00 2001 From: Leooooooo1234 <112930123+Leooooooo1234@users.noreply.github.com> Date: Mon, 20 Nov 2023 19:56:28 +0800 Subject: [PATCH 03/14] 3 --- dasedevops_spring_demo/login/dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 dasedevops_spring_demo/login/dockerfile diff --git a/dasedevops_spring_demo/login/dockerfile b/dasedevops_spring_demo/login/dockerfile new file mode 100644 index 0000000..ac1f1c7 --- /dev/null +++ b/dasedevops_spring_demo/login/dockerfile @@ -0,0 +1,6 @@ +FROM openjdk:8 +MAINTAINER ningzhicheng +VOLUME /tmp +ADD ./target/*.jar /login.jar +ENTRYPOINT ["java","-jar","/login.jar"] +EXPOSE 8000 \ No newline at end of file From 92f60f47b45f9ce8274b8f12fe3d3a50f9e94717 Mon Sep 17 00:00:00 2001 From: Leooooooo1234 <112930123+Leooooooo1234@users.noreply.github.com> Date: Mon, 20 Nov 2023 19:56:53 +0800 Subject: [PATCH 04/14] 4 --- dasedevops_spring_demo/provider_one/dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 dasedevops_spring_demo/provider_one/dockerfile diff --git a/dasedevops_spring_demo/provider_one/dockerfile b/dasedevops_spring_demo/provider_one/dockerfile new file mode 100644 index 0000000..4066233 --- /dev/null +++ b/dasedevops_spring_demo/provider_one/dockerfile @@ -0,0 +1,6 @@ +FROM openjdk:8 +MAINTAINER ningzhicheng +VOLUME /tmp +ADD ./target/*.jar /provider_one.jar +ENTRYPOINT ["java","-jar","/provider_one.jar"] +EXPOSE 8666 \ No newline at end of file From 50d4da7078bfb0c638a0a1b81591b1a12f9e24e7 Mon Sep 17 00:00:00 2001 From: Leooooooo1234 <112930123+Leooooooo1234@users.noreply.github.com> Date: Mon, 20 Nov 2023 19:57:45 +0800 Subject: [PATCH 05/14] 5 --- dasedevops_spring_demo/provider_two/dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 dasedevops_spring_demo/provider_two/dockerfile diff --git a/dasedevops_spring_demo/provider_two/dockerfile b/dasedevops_spring_demo/provider_two/dockerfile new file mode 100644 index 0000000..a7e6fc6 --- /dev/null +++ b/dasedevops_spring_demo/provider_two/dockerfile @@ -0,0 +1,6 @@ +FROM openjdk:8 +MAINTAINER ningzhicheng +VOLUME /tmp +ADD ./target/*.jar /provider_two.jar +ENTRYPOINT ["java","-jar","/provider_two.jar"] +EXPOSE 8667 \ No newline at end of file From c8c4c308ccf6e2045eeb02ab11dc315c0cb1bd25 Mon Sep 17 00:00:00 2001 From: Leooooooo1234 <112930123+Leooooooo1234@users.noreply.github.com> Date: Mon, 20 Nov 2023 19:58:05 +0800 Subject: [PATCH 06/14] 6 --- dasedevops_spring_demo/provider_three/dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 dasedevops_spring_demo/provider_three/dockerfile diff --git a/dasedevops_spring_demo/provider_three/dockerfile b/dasedevops_spring_demo/provider_three/dockerfile new file mode 100644 index 0000000..e05a549 --- /dev/null +++ b/dasedevops_spring_demo/provider_three/dockerfile @@ -0,0 +1,6 @@ +FROM openjdk:8 +MAINTAINER ningzhicheng +VOLUME /tmp +ADD ./target/*.jar /provider_three.jar +ENTRYPOINT ["java","-jar","/provider_three.jar"] +EXPOSE 8668 \ No newline at end of file From 7df9ad9c24e7fe9e9e3932f3c9e1c55656c9cc08 Mon Sep 17 00:00:00 2001 From: Leooooooo1234 <112930123+Leooooooo1234@users.noreply.github.com> Date: Mon, 20 Nov 2023 19:58:26 +0800 Subject: [PATCH 07/14] 7 --- dasedevops_spring_demo/docker-compose.yml | 32 +++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 dasedevops_spring_demo/docker-compose.yml diff --git a/dasedevops_spring_demo/docker-compose.yml b/dasedevops_spring_demo/docker-compose.yml new file mode 100644 index 0000000..4b8d1ff --- /dev/null +++ b/dasedevops_spring_demo/docker-compose.yml @@ -0,0 +1,32 @@ +version: "3" + +services: + providerOne: + image: ${{ secrets.ALI_NAMESPACE_URL }}/provider_one:latest + ports: + - "8666:8666" + + gateway: + image: ${{ secrets.ALI_NAMESPACE_URL }}/gateway:latest + ports: + - "8080:8080" + + login: + image: ${{ secrets.ALI_NAMESPACE_URL }}/login:latest + ports: + - "8000:8000" + + hello: + image: ${{ secrets.ALI_NAMESPACE_URL }}/hello:latest + ports: + - "8001:8001" + + providerTwo: + image: ${{ secrets.ALI_NAMESPACE_URL }}/provider_two:latest + ports: + - "8667:8667" + + providerThree: + image: ${{ secrets.ALI_NAMESPACE_URL }}/provider_three:latest + ports: + - "8668:8668" \ No newline at end of file From 273ac8d49a0a42c73a3ebb03fcd6f3a2e6a1941c Mon Sep 17 00:00:00 2001 From: Leooooooo1234 <10204602470@stu.ecnu.edu.cn> Date: Mon, 20 Nov 2023 20:08:16 +0800 Subject: [PATCH 08/14] test --- .github/workflows/docker-publish.yml | 83 +++++++++++++++++++ dasedevops_spring_demo/docker-compose.yml | 32 +++++++ dasedevops_spring_demo/gateway/dockerfile | 6 ++ dasedevops_spring_demo/hello/dockerfile | 6 ++ dasedevops_spring_demo/login/dockerfile | 6 ++ .../provider_one/dockerfile | 6 ++ .../provider_three/dockerfile | 6 ++ .../provider_two/dockerfile | 6 ++ 8 files changed, 151 insertions(+) create mode 100644 .github/workflows/docker-publish.yml create mode 100644 dasedevops_spring_demo/docker-compose.yml create mode 100644 dasedevops_spring_demo/gateway/dockerfile create mode 100644 dasedevops_spring_demo/hello/dockerfile create mode 100644 dasedevops_spring_demo/login/dockerfile create mode 100644 dasedevops_spring_demo/provider_one/dockerfile create mode 100644 dasedevops_spring_demo/provider_three/dockerfile create mode 100644 dasedevops_spring_demo/provider_two/dockerfile diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml new file mode 100644 index 0000000..8da9fba --- /dev/null +++ b/.github/workflows/docker-publish.yml @@ -0,0 +1,83 @@ +name: SpringCloud CI/CD with Docker +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +env: + MODULE_1: gateway + MODULE_2: hello + MODULE_3: login + MODULE_4: provider_one + MODULE_5: provider_two + MODULE_6: provider_three + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 8 + uses: actions/setup-java@v2 + with: + distribution: 'temurin' + java-version: '8' + cache: 'maven' + - name: Build with Maven + run: | + whoami + pwd + cd dasedevops_spring_demo + mvn -B package --file pom.xml + pwd + - name: Login to Aliyun Container Registry (ACR) + uses: aliyun/acr-login@v1 + with: + login-server: https://registry.cn-shanghai.aliyuncs.com + region-id: cn-shanghai # 3 + username: "${{ secrets.ACR_USERNAME }}" + password: "${{ secrets.ACR_PASSWORD }}" + - name: Build and push image + run: | + docker build -t ${{ secrets.ALI_NAMESPACE_URL }}/$MODULE_1:latest ./dasedevops_spring_demo/$MODULE_1 + docker push ${{ secrets.ALI_NAMESPACE_URL }}/$MODULE_1:latest + docker build -t ${{ secrets.ALI_NAMESPACE_URL }}/$MODULE_2:latest ./dasedevops_spring_demo/$MODULE_2 + docker push ${{ secrets.ALI_NAMESPACE_URL }}/$MODULE_2:latest + docker build -t ${{ secrets.ALI_NAMESPACE_URL }}/$MODULE_3:latest ./dasedevops_spring_demo/$MODULE_3 + docker push ${{ secrets.ALI_NAMESPACE_URL }}/$MODULE_3:latest + docker build -t ${{ secrets.ALI_NAMESPACE_URL }}/$MODULE_4:latest ./dasedevops_spring_demo/$MODULE_4 + docker push ${{ secrets.ALI_NAMESPACE_URL }}/$MODULE_4:latest + docker build -t ${{ secrets.ALI_NAMESPACE_URL }}/$MODULE_5:latest ./dasedevops_spring_demo/$MODULE_5 + docker push ${{ secrets.ALI_NAMESPACE_URL }}/$MODULE_5:latest + docker build -t ${{ secrets.ALI_NAMESPACE_URL }}/$MODULE_6:latest ./dasedevops_spring_demo/$MODULE_6 + docker push ${{ secrets.ALI_NAMESPACE_URL }}/$MODULE_6:latest + + - name: Copy single file to remote + uses: garygrossgarten/github-action-scp@release + with: + local: ./dasedevops_spring_demo/docker-compose.yml + remote: scp/devops_demo/docker-compose.yml + host: ${{ secrets.HOST }} + username: ${{ secrets.USER_NAME }} + password: ${{ secrets.USER_PASSWORD }} + port: ${{ secrets.PORT }} + + depoly: + needs: [ build ] + name: Docker Pull And Docker-compose Run + runs-on: ubuntu-latest + steps: + - name: executing remote ssh commands using password + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.HOST }} + username: ${{ secrets.USER_NAME }} + password: ${{ secrets.USER_PASSWORD }} + port: ${{ secrets.PORT }} + script: | + docker-compose -f scp/devops_demo/docker-compose.yml up -d + docker-compose -f scp/devops_demo/docker-compose.yml stop + docker-compose -f scp/devops_demo/docker-compose.yml pull + docker-compose -f scp/devops_demo/docker-compose.yml up -d + docker image prune -f \ No newline at end of file diff --git a/dasedevops_spring_demo/docker-compose.yml b/dasedevops_spring_demo/docker-compose.yml new file mode 100644 index 0000000..4b8d1ff --- /dev/null +++ b/dasedevops_spring_demo/docker-compose.yml @@ -0,0 +1,32 @@ +version: "3" + +services: + providerOne: + image: ${{ secrets.ALI_NAMESPACE_URL }}/provider_one:latest + ports: + - "8666:8666" + + gateway: + image: ${{ secrets.ALI_NAMESPACE_URL }}/gateway:latest + ports: + - "8080:8080" + + login: + image: ${{ secrets.ALI_NAMESPACE_URL }}/login:latest + ports: + - "8000:8000" + + hello: + image: ${{ secrets.ALI_NAMESPACE_URL }}/hello:latest + ports: + - "8001:8001" + + providerTwo: + image: ${{ secrets.ALI_NAMESPACE_URL }}/provider_two:latest + ports: + - "8667:8667" + + providerThree: + image: ${{ secrets.ALI_NAMESPACE_URL }}/provider_three:latest + ports: + - "8668:8668" \ No newline at end of file diff --git a/dasedevops_spring_demo/gateway/dockerfile b/dasedevops_spring_demo/gateway/dockerfile new file mode 100644 index 0000000..db303b6 --- /dev/null +++ b/dasedevops_spring_demo/gateway/dockerfile @@ -0,0 +1,6 @@ +FROM openjdk:8 +MAINTAINER ningzhicheng +VOLUME /tmp +ADD ./target/*.jar /gateway.jar +ENTRYPOINT ["java","-jar","/gateway.jar"] +EXPOSE 8080 \ No newline at end of file diff --git a/dasedevops_spring_demo/hello/dockerfile b/dasedevops_spring_demo/hello/dockerfile new file mode 100644 index 0000000..c02774f --- /dev/null +++ b/dasedevops_spring_demo/hello/dockerfile @@ -0,0 +1,6 @@ +FROM openjdk:8 +MAINTAINER ningzhicheng +VOLUME /tmp +ADD ./target/*.jar /hello.jar +ENTRYPOINT ["java","-jar","/hello.jar"] +EXPOSE 8001 \ No newline at end of file diff --git a/dasedevops_spring_demo/login/dockerfile b/dasedevops_spring_demo/login/dockerfile new file mode 100644 index 0000000..ac1f1c7 --- /dev/null +++ b/dasedevops_spring_demo/login/dockerfile @@ -0,0 +1,6 @@ +FROM openjdk:8 +MAINTAINER ningzhicheng +VOLUME /tmp +ADD ./target/*.jar /login.jar +ENTRYPOINT ["java","-jar","/login.jar"] +EXPOSE 8000 \ No newline at end of file diff --git a/dasedevops_spring_demo/provider_one/dockerfile b/dasedevops_spring_demo/provider_one/dockerfile new file mode 100644 index 0000000..4066233 --- /dev/null +++ b/dasedevops_spring_demo/provider_one/dockerfile @@ -0,0 +1,6 @@ +FROM openjdk:8 +MAINTAINER ningzhicheng +VOLUME /tmp +ADD ./target/*.jar /provider_one.jar +ENTRYPOINT ["java","-jar","/provider_one.jar"] +EXPOSE 8666 \ No newline at end of file diff --git a/dasedevops_spring_demo/provider_three/dockerfile b/dasedevops_spring_demo/provider_three/dockerfile new file mode 100644 index 0000000..e05a549 --- /dev/null +++ b/dasedevops_spring_demo/provider_three/dockerfile @@ -0,0 +1,6 @@ +FROM openjdk:8 +MAINTAINER ningzhicheng +VOLUME /tmp +ADD ./target/*.jar /provider_three.jar +ENTRYPOINT ["java","-jar","/provider_three.jar"] +EXPOSE 8668 \ No newline at end of file diff --git a/dasedevops_spring_demo/provider_two/dockerfile b/dasedevops_spring_demo/provider_two/dockerfile new file mode 100644 index 0000000..a7e6fc6 --- /dev/null +++ b/dasedevops_spring_demo/provider_two/dockerfile @@ -0,0 +1,6 @@ +FROM openjdk:8 +MAINTAINER ningzhicheng +VOLUME /tmp +ADD ./target/*.jar /provider_two.jar +ENTRYPOINT ["java","-jar","/provider_two.jar"] +EXPOSE 8667 \ No newline at end of file From 395377c655d85da3108a0f9cb464793084133a4f Mon Sep 17 00:00:00 2001 From: Leooooooo1234 <10204602470@stu.ecnu.edu.cn> Date: Mon, 20 Nov 2023 21:14:47 +0800 Subject: [PATCH 09/14] test --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 45542ff..cd13b09 100644 --- a/README.md +++ b/README.md @@ -6,5 +6,4 @@ 后端使用Springboot作为框架,还使用了下面几个微服务管理组件:微服务注册中心:Nacos、微服务配置中心:Nacos、微服务服务调用客户端:Feign、路由控制:Spring Cloud Gateway。 - - +我修改 From 371aab278767452b004ac4095da6ad37e9f805ba Mon Sep 17 00:00:00 2001 From: Leooooooo1234 <10204602470@stu.ecnu.edu.cn> Date: Mon, 20 Nov 2023 21:29:27 +0800 Subject: [PATCH 10/14] test --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cd13b09..ee7fbc0 100644 --- a/README.md +++ b/README.md @@ -6,4 +6,4 @@ 后端使用Springboot作为框架,还使用了下面几个微服务管理组件:微服务注册中心:Nacos、微服务配置中心:Nacos、微服务服务调用客户端:Feign、路由控制:Spring Cloud Gateway。 -我修改 +我修改还修改? From 2d66c58a93a33e5f9bbe8d2785fcd2459999c383 Mon Sep 17 00:00:00 2001 From: Leooooooo1234 <10204602470@stu.ecnu.edu.cn> Date: Mon, 20 Nov 2023 21:35:18 +0800 Subject: [PATCH 11/14] test --- .github/workflows/docker-publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 8da9fba..5587627 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -40,9 +40,9 @@ jobs: password: "${{ secrets.ACR_PASSWORD }}" - name: Build and push image run: | - docker build -t ${{ secrets.ALI_NAMESPACE_URL }}/$MODULE_1:latest ./dasedevops_spring_demo/$MODULE_1 + docker build -t registry.cn-shanghai.aliyuncs.com/wodeyunjisuanzuoye/action/$MODULE_1:latest ./dasedevops_spring_demo/$MODULE_1 docker push ${{ secrets.ALI_NAMESPACE_URL }}/$MODULE_1:latest - docker build -t ${{ secrets.ALI_NAMESPACE_URL }}/$MODULE_2:latest ./dasedevops_spring_demo/$MODULE_2 + docker build -t registry.cn-shanghai.aliyuncs.com/wodeyunjisuanzuoye/action/$MODULE_2:latest ./dasedevops_spring_demo/$MODULE_2 docker push ${{ secrets.ALI_NAMESPACE_URL }}/$MODULE_2:latest docker build -t ${{ secrets.ALI_NAMESPACE_URL }}/$MODULE_3:latest ./dasedevops_spring_demo/$MODULE_3 docker push ${{ secrets.ALI_NAMESPACE_URL }}/$MODULE_3:latest From 545522410bea829dbf0979ea81e3f79ce14f1c4a Mon Sep 17 00:00:00 2001 From: Leooooooo1234 <10204602470@stu.ecnu.edu.cn> Date: Mon, 20 Nov 2023 21:37:37 +0800 Subject: [PATCH 12/14] test --- .github/workflows/docker-publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 5587627..8da9fba 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -40,9 +40,9 @@ jobs: password: "${{ secrets.ACR_PASSWORD }}" - name: Build and push image run: | - docker build -t registry.cn-shanghai.aliyuncs.com/wodeyunjisuanzuoye/action/$MODULE_1:latest ./dasedevops_spring_demo/$MODULE_1 + docker build -t ${{ secrets.ALI_NAMESPACE_URL }}/$MODULE_1:latest ./dasedevops_spring_demo/$MODULE_1 docker push ${{ secrets.ALI_NAMESPACE_URL }}/$MODULE_1:latest - docker build -t registry.cn-shanghai.aliyuncs.com/wodeyunjisuanzuoye/action/$MODULE_2:latest ./dasedevops_spring_demo/$MODULE_2 + docker build -t ${{ secrets.ALI_NAMESPACE_URL }}/$MODULE_2:latest ./dasedevops_spring_demo/$MODULE_2 docker push ${{ secrets.ALI_NAMESPACE_URL }}/$MODULE_2:latest docker build -t ${{ secrets.ALI_NAMESPACE_URL }}/$MODULE_3:latest ./dasedevops_spring_demo/$MODULE_3 docker push ${{ secrets.ALI_NAMESPACE_URL }}/$MODULE_3:latest From 8f8340998221a04100d213b182aa73781f38cdee Mon Sep 17 00:00:00 2001 From: Leooooooo1234 <10204602470@stu.ecnu.edu.cn> Date: Mon, 20 Nov 2023 21:45:26 +0800 Subject: [PATCH 13/14] test --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index ee7fbc0..0a5ea5c 100644 --- a/README.md +++ b/README.md @@ -7,3 +7,5 @@ 后端使用Springboot作为框架,还使用了下面几个微服务管理组件:微服务注册中心:Nacos、微服务配置中心:Nacos、微服务服务调用客户端:Feign、路由控制:Spring Cloud Gateway。 我修改还修改? + +再来 From 283297dbd34b5daea2f6f6b3d77c4f18b9482ed3 Mon Sep 17 00:00:00 2001 From: Leooooooo1234 <10204602470@stu.ecnu.edu.cn> Date: Mon, 20 Nov 2023 21:53:01 +0800 Subject: [PATCH 14/14] test --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0a5ea5c..7f2619b 100644 --- a/README.md +++ b/README.md @@ -8,4 +8,4 @@ 我修改还修改? -再来 +再来6