diff --git a/.workflow/pipeline-docker.yml b/.workflow/pipeline-docker.yml index bf644991..464ef6c6 100644 --- a/.workflow/pipeline-docker.yml +++ b/.workflow/pipeline-docker.yml @@ -11,6 +11,63 @@ triggers: include: - ^deploy-docker stages: + - name: stage-5ecf171c + displayName: 项目打包 + strategy: naturally + trigger: auto + executor: + - kerwincui + steps: + - step: build@maven + name: build_maven + displayName: Maven 构建后端 + jdkVersion: '8' + mavenVersion: 3.6.1 + commands: + - cd ./springboot + - mvn -B clean package -Dmaven.test.skip=true + artifacts: + - name: BUILD_JAVA + path: + - ./springboot/wumei-admin/target/wumei-admin.jar + settings: [] + strategy: + retry: '0' + - step: build@nodejs + name: build_nodejs + displayName: Nodejs 构建前端 + nodeVersion: 14.16.0 + commands: + - cd ./vue + - npm install --registry=https://registry.npm.taobao.org \ + - '&& rm -rf ./dist && npm run build:prod' + artifacts: + - name: BUILD_VUE + path: + - ./vue/dist + strategy: + retry: '0' + - name: stage-f5631c9e + displayName: 上传打包文件 + strategy: naturally + trigger: auto + executor: + - kerwincui + steps: + - step: publish@general_artifacts + name: publish_general_artifacts_java + displayName: 上传后端制品 + dependArtifact: BUILD_JAVA + artifactName: springboot + strategy: + retry: '0' + - step: publish@general_artifacts + name: publish_general_artifacts_vue + displayName: 上传前端制品 + dependArtifact: BUILD_VUE + artifactName: vue + strategy: + retry: '0' - name: stage-59a550ac displayName: 构建镜像 strategy: naturally @@ -26,6 +83,9 @@ stages: tag: kerwincui/wumei-smart:1.01 dockerfile: ./docker/Dockerfile context: ./docker + artifacts: + - ${BUILD_JAVA} + - ${BUILD_VUE} isCache: true strategy: retry: '0' diff --git a/docker/Dockerfile b/docker/Dockerfile index ee2c5c67..830f828b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -15,19 +15,25 @@ RUN apt-get update && \ echo "1. 安装网络工具和设置时区 =====================" && \ apt-get install wget -y --no-install-recommends && \ ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ + echo "2. 更换国内源 =============================" && \ wget http://qiniu.xiwen.online/Debian10.list && \ mv Debian10.list /etc/apt/sources.list && \ apt update && apt upgrade -y && \ + echo "3. 安装压缩工具 ============================" && \ - apt install zip -y && \ + apt install zip -y && \ + echo "4. 安装nginx ==============================" && \ apt-get install nginx -y --no-install-recommends && \ + echo "5. 安装redis ===============================" && \ apt-get install redis-server -y --no-install-recommends && \ + echo "6. 修改redis配置 =============================" && \ sed -i "s/# requirepass foobared/requirepass wumei-smart/g" /etc/redis/redis.conf && \ sed -i "s/bind 127.0.0.1/# bind 127.0.0.1/g" /etc/redis/redis.conf + # echo "6. 安装 emqx =============================" && \ # apt update && apt install -y \ # apt-transport-https \ @@ -53,9 +59,7 @@ RUN apt-get update && \ # COPY ./emqx4.0/emqx_web_hook.conf /etc/emqx/plugins/emqx_web_hook.conf # COPY ./emqx4.0/loaded_plugins /var/lib/emqx/loaded_plugins COPY ./nginx.conf /etc/nginx/nginx.conf -# 拷贝前后端压缩文件到容器,容器内解压后删除 -# COPY ./wumei-smart.tar /var/ -# RUN cd /var && tar -xvf wumei-smart.tar && rm wumei-smart.tar + # 解压前端和后端文件并放置到对应位置