Compare commits

..

No commits in common. "master" and "1.0.8" have entirely different histories.

5 changed files with 29 additions and 23 deletions

View File

@ -6,8 +6,8 @@ on:
- develop - develop
env: env:
IMAGE_NAME: ${{ gitea.repository_owner }}/maketemplate.web IMAGE_NAME: ${{ gitea.repository_owner }}/usercenter.web
PUBLISH_PATH: maketemplate.web PUBLISH_PATH: usercenter.web
PUBLISH_HOST: 10.255.255.44 PUBLISH_HOST: 10.255.255.44
PUBLISH_PORT: 22 PUBLISH_PORT: 22
PUBLISH_REPLICAS: 1 #启动副本数量 PUBLISH_REPLICAS: 1 #启动副本数量
@ -16,17 +16,21 @@ jobs:
job1: job1:
name: 编译发布 name: 编译发布
runs-on: linux runs-on: linux
container:
image: node:16-bullseye
volumes:
#挂载缓存
- /opt/.runner/node_modules:/cache
steps: steps:
- name: 下载源码 - name: 下载源码
uses: actions/checkout@v4 uses: actions/checkout@v3
- name: 使用缓存 - name: 使用缓存
uses: actions/cache@master uses: actions/cache@master
with: with:
mount: | mount: |
node_modules node_modules
hash_files: |
package.json
- name: 编译项目 - name: 编译项目
run: | run: |

View File

@ -6,8 +6,8 @@ on:
- master - master
env: env:
IMAGE_NAME: ${{ gitea.repository_owner }}/maketemplate.web IMAGE_NAME: ${{ gitea.repository_owner }}/usercenter.web
PUBLISH_PATH: maketemplate.web PUBLISH_PATH: usercenter.web
PUBLISH_HOST: 10.255.255.74 PUBLISH_HOST: 10.255.255.74
PUBLISH_PORT: 10022 PUBLISH_PORT: 10022
PUBLISH_REPLICAS: 1 #启动副本数量 PUBLISH_REPLICAS: 1 #启动副本数量
@ -21,7 +21,7 @@ jobs:
steps: steps:
- name: 下载源码 - name: 下载源码
uses: actions/checkout@v4 uses: actions/checkout@v3
- name: 发布版本 - name: 发布版本
id: publish_version id: publish_version
@ -33,15 +33,16 @@ jobs:
needs: release needs: release
steps: steps:
- name: 下载源码 - name: 下载源码
uses: actions/checkout@v4 uses: actions/checkout@v3
- name: 下载源码
uses: actions/checkout@v3
- name: 使用缓存 - name: 使用缓存
uses: actions/cache@master uses: actions/cache@master
with: with:
mount: | mount: |
node_modules node_modules
hash_files: |
package.json
- name: 编译项目 - name: 编译项目
shell: bash shell: bash

View File

@ -6,8 +6,8 @@ on:
- staging - staging
env: env:
IMAGE_NAME: ${{ gitea.repository_owner }}/maketemplate.web IMAGE_NAME: ${{ gitea.repository_owner }}/usercenter.web
PUBLISH_PATH: maketemplate.web PUBLISH_PATH: usercenter.web
PUBLISH_HOST: 10.255.255.3 PUBLISH_HOST: 10.255.255.3
PUBLISH_PORT: 22 PUBLISH_PORT: 22
PUBLISH_REPLICAS: 1 #启动副本数量 PUBLISH_REPLICAS: 1 #启动副本数量
@ -24,15 +24,13 @@ jobs:
steps: steps:
- name: 下载源码 - name: 下载源码
uses: actions/checkout@v4 uses: actions/checkout@v3
- name: 使用缓存 - name: 使用缓存
uses: actions/cache@master uses: actions/cache@master
with: with:
mount: | mount: |
node_modules node_modules
hash_files: |
package.json
- name: 编译项目 - name: 编译项目
shell: bash shell: bash

View File

@ -6,8 +6,8 @@ on:
- published - published
env: env:
IMAGE_NAME: ${{ gitea.repository_owner }}/maketemplate.web IMAGE_NAME: ${{ gitea.repository_owner }}/usercenter.web
PUBLISH_PATH: maketemplate.web PUBLISH_PATH: usercenter.web
PUBLISH_HOST: 10.255.255.74 PUBLISH_HOST: 10.255.255.74
PUBLISH_PORT: 10022 PUBLISH_PORT: 10022
PUBLISH_REPLICAS: 1 #启动副本数量 PUBLISH_REPLICAS: 1 #启动副本数量
@ -16,18 +16,21 @@ jobs:
job1: job1:
name: 编译发布 name: 编译发布
runs-on: linux runs-on: linux
container:
image: node:16-bullseye
volumes:
#挂载缓存
- /opt/.runner/node_modules:/cache
steps: steps:
- name: 下载源码 - name: 下载源码
uses: actions/checkout@v4 uses: actions/checkout@v3
- name: 使用缓存 - name: 使用缓存
uses: actions/cache@master uses: actions/cache@master
with: with:
mount: | mount: |
node_modules node_modules
hash_files: |
package.json
- name: 编译项目 - name: 编译项目
shell: bash shell: bash

View File

@ -2,12 +2,12 @@ version: "3"
services: services:
usercenter-web: usercenter-web:
image: ${REGISTRY:-harbor.w.23544.com:8843}/marking/maketemplate.web:${TAG:-latest} image: ${REGISTRY:-harbor.w.23544.com:8843}/marking/usercenter.web:${TAG:-latest}
hostname: marking hostname: marking
environment: environment:
TZ: Asia/Shanghai TZ: Asia/Shanghai
ports: ports:
- 8898:80 - 4400:80
deploy: deploy:
mode: replicated mode: replicated
replicas: ${REPLICAS:-1} replicas: ${REPLICAS:-1}