From 70421d43ed7e846fca806dccebc383a8d8fb45c0 Mon Sep 17 00:00:00 2001 From: linhaojun Date: Mon, 19 Jun 2023 09:44:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20github=20action?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/aurora.yml | 92 ++++++++++++++++++++++++++++++++---- aurora-springboot/Dockerfile | 8 ++++ aurora-vue/Dockerfile | 8 ++++ 3 files changed, 99 insertions(+), 9 deletions(-) create mode 100644 aurora-springboot/Dockerfile create mode 100644 aurora-vue/Dockerfile diff --git a/.github/workflows/aurora.yml b/.github/workflows/aurora.yml index 8691035..1fbc0ca 100644 --- a/.github/workflows/aurora.yml +++ b/.github/workflows/aurora.yml @@ -2,13 +2,14 @@ name: Aurora CI on: push: - branches: ["master"] + branches: ["dev"] jobs: - build: + aurora-springboot-build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - name: Checkout + uses: actions/checkout@v3 - name: Set up JDK uses: actions/setup-java@v3 @@ -22,11 +23,84 @@ jobs: cd aurora-springboot mvn -B package --file pom.xml - - name: Delete old jar - run: sshpass -p ${{secrets.REMOTE_HOST_B_PASSWORD}} ssh -o StrictHostKeyChecking=no root@${{secrets.REMOTE_HOST_B_IP}} "cd /usr/local/aurora-springboot && rm -rf ./aurora-springboot-0.0.1.jar" + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 - - name: Copy jar to remote server - run: sshpass -p ${{secrets.REMOTE_HOST_B_PASSWORD}} scp -o StrictHostKeyChecking=no ./aurora-springboot/target/aurora-springboot-0.0.1.jar root@${{secrets.REMOTE_HOST_B_IP}}:/usr/local/aurora-springboot + - name: Login to DockerHub + uses: docker/login-action@v2 + with: + username: ${{secrets.DOCKER_USERNAME}} + password: ${{secrets.DOCKER_PASSWORD}} + + - name: Build and push + uses: docker/build-push-action@v2 + with: + push: true + context: aurora-springboot + tags: ${{secrets.DOCKER_USERNAME}}/aurora-springboot:latest + file: aurora-springboot/Dockerfile + + - name: Update aurora-springboot container + run: + sshpass -p ${{secrets.REMOTE_HOST_B_PASSWORD}} ssh -o StrictHostKeyChecking=no + root@${{secrets.REMOTE_HOST_B_IP}} "cd /usr/local/aurora-springboot && sh aurora-springboot.sh" + + aurora-vue-build: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Set up Node.js + uses: actions/setup-node@v2 + with: + node-version: "16" + cache: "npm" + cache-dependency-path: "aurora-vue/aurora-*/package-lock.json" + + - name: Install aurora-blog dependencies + run: | + cd aurora-vue/aurora-blog + npm install + + - name: Build aurora-blog + run: | + cd aurora-vue/aurora-blog + npm run build + + - name: Install aurora-admin dependencies + run: | + cd aurora-vue/aurora-admin + npm install + + - name: Build aurora-admin + run: | + cd aurora-vue/aurora-admin + npm run build + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Login to DockerHub + uses: docker/login-action@v2 + with: + username: ${{secrets.DOCKER_USERNAME}} + password: ${{secrets.DOCKER_PASSWORD}} + + - name: Build and push + uses: docker/build-push-action@v2 + with: + push: true + context: aurora-vue + tags: ${{ secrets.DOCKER_USERNAME }}/aurora-vue:latest + file: aurora-vue/Dockerfile + + - name: HostB transfer aurora-vue to tencent-registery + run: + sshpass -p ${{secrets.REMOTE_HOST_B_PASSWORD}} ssh -o StrictHostKeyChecking=no + root@${{secrets.REMOTE_HOST_B_IP}} "cd /usr/local/aurora-vue && sh aurora-vue.sh" - - name: Run jar on remote server - run: sshpass -p ${{secrets.REMOTE_HOST_B_PASSWORD}} ssh -o StrictHostKeyChecking=no root@${{secrets.REMOTE_HOST_B_IP}} "cd /usr/local/aurora-springboot-0.0.1.jar && ./aurora-start.sh" + - name: Update aurora-vue container + run: + sshpass -p ${{secrets.REMOTE_HOST_A_PASSWORD}} ssh -o StrictHostKeyChecking=no + root@${{secrets.REMOTE_HOST_A_IP}} "cd /usr/local/aurora-vue && sh aurora-vue.sh" diff --git a/aurora-springboot/Dockerfile b/aurora-springboot/Dockerfile new file mode 100644 index 0000000..f89d846 --- /dev/null +++ b/aurora-springboot/Dockerfile @@ -0,0 +1,8 @@ +FROM openjdk:8 +RUN rm -f /etc/localtime \ +&& ln -sv /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ +&& echo "Asia/Shanghai" > /etc/timezone +COPY target/aurora-springboot-0.0.1.jar /app/aurora-springboot-0.0.1.jar +COPY src/main/resources/application.yml /config/application.yml +ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/app/aurora-springboot-0.0.1.jar","--spring.config.location=/config/application.yml"] +EXPOSE 8080 diff --git a/aurora-vue/Dockerfile b/aurora-vue/Dockerfile new file mode 100644 index 0000000..436a1eb --- /dev/null +++ b/aurora-vue/Dockerfile @@ -0,0 +1,8 @@ +FROM nginx:stable-alpine3.17 +RUN mkdir -p /usr/local/aurora-vue/blog/ +RUN mkdir -p /usr/local/aurora-vue/admin/ +COPY aurora-blog/dist/ /usr/local/aurora-vue/blog/ +COPY aurora-admin/dist/ /usr/local/aurora-vue/admin/ +CMD ["nginx", "-g", "daemon off;"] +EXPOSE 80 +EXPOSE 443 From 64c3dec4ccb66a15ae301302f5841f53df0000f3 Mon Sep 17 00:00:00 2001 From: linhaojun Date: Tue, 20 Jun 2023 12:55:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0readme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 4a17103..381b58c 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,9 @@ ## 前言 -- 开源不易，希望大家star支持一下 +- 开源不易，希望大家 star 支持一下 +- 由于本人还在上学，主语言不是 Java，所以项目更新频率较慢，但是本项目会长期维护，有问题可以提 issue， + 同时也欢迎大家来共建此项目，包括但不限于：bug 修复、代码优化、功能开发等等 ## 在线地址 @@ -13,22 +15,24 @@ ## 相关技术 ### 前端： + - 基础框架：vue3(前台) vue2(后台) - 状态管理：pinia(前台) vuex(后台) - 路由组件：vue-router - 网络请求：axios -- 其他技术：详见前端项目的package.json +- 其他技术：详见前端项目的 package.json ### 后端： + - 基础框架：springboot -- ORM框架：mybatisplus +- ORM 框架：mybatisplus - 权限框架：springsecurity - 缓存中间件：redis - 消息中间件：rabbitmq - 搜索引擎：elasticsearch - 对象存储：minio - 定时任务：quartz -- 其他技术：详见后端项目的pom.xml +- 其他技术：详见后端项目的 pom.xml ## 部署 @@ -36,9 +40,9 @@ ## 交流群 -- QQ群：338371628 +- QQ 群：338371628 ## 鸣谢 -- 感谢[网盾星球](https://cdn.netdun.net/)赞助的CDN +- 感谢[网盾星球](https://cdn.netdun.net/)赞助的 CDN - 感谢[jetbrains](https://www.jetbrains.com/)提供的开源开发许可证 From a5d6b9db9cd5e8cfddee1eb90c06e22bf7f07d40 Mon Sep 17 00:00:00 2001 From: linhaojun Date: Tue, 20 Jun 2023 12:57:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0readme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 381b58c..88a3a47 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ ## 前言 -- 开源不易，希望大家 star 支持一下 -- 由于本人还在上学，主语言不是 Java，所以项目更新频率较慢，但是本项目会长期维护，有问题可以提 issue， +- 开源不易，希望大家star支持一下 +- 由于本人还在上学，主语言不是Java，所以项目更新频率较慢，但是本项目会长期维护，有问题可以提issue， 同时也欢迎大家来共建此项目，包括但不限于：bug 修复、代码优化、功能开发等等 ## 在线地址 @@ -20,19 +20,19 @@ - 状态管理：pinia(前台) vuex(后台) - 路由组件：vue-router - 网络请求：axios -- 其他技术：详见前端项目的 package.json +- 其他技术：详见前端项目的package.json ### 后端： - 基础框架：springboot -- ORM 框架：mybatisplus +- ORM框架：mybatisplus - 权限框架：springsecurity - 缓存中间件：redis - 消息中间件：rabbitmq - 搜索引擎：elasticsearch - 对象存储：minio - 定时任务：quartz -- 其他技术：详见后端项目的 pom.xml +- 其他技术：详见后端项目的pom.xml ## 部署 @@ -40,9 +40,9 @@ ## 交流群 -- QQ 群：338371628 +- QQ群：338371628 ## 鸣谢 -- 感谢[网盾星球](https://cdn.netdun.net/)赞助的 CDN +- 感谢[网盾星球](https://cdn.netdun.net/)赞助的CDN - 感谢[jetbrains](https://www.jetbrains.com/)提供的开源开发许可证