提交 405a7eed 作者: bax

更改配置

上级 b26862ec
流水线 #6890 已失败 于阶段
in 54 秒
stages: stages:
- clean
- dockerbuild - dockerbuild
- kustomize_tag_push - kustomize_tag_push
...@@ -16,14 +15,8 @@ variables: ...@@ -16,14 +15,8 @@ variables:
ACR_EE_TAG: $CI_COMMIT_SHA ACR_EE_TAG: $CI_COMMIT_SHA
JAVA_VERSION: '8' JAVA_VERSION: '8'
GITLAB_URL: https://oauth2:sbs5WNE7dj4MKoKhh5u_@git.mmcuav.cn/test-ci/h5-ci-test.git GITLAB_URL: https://oauth2:MjVJKxB7m4tCy7symBzn@git.mmcuav.cn/iuav/h5.git
GITLAB_REGISTRY: https://git.mmcuav.cn/test-ci/h5-ci-test.git
mvn_clean:
stage: clean
script:
- echo "情理中..."
- mvn clean -B -Dmaven.test.skip=true --settings /usr/local/maven/conf/settings.xml
docker_build_dev: docker_build_dev:
stage: dockerbuild stage: dockerbuild
...@@ -31,12 +24,11 @@ docker_build_dev: ...@@ -31,12 +24,11 @@ docker_build_dev:
NAMESPACE: sharefly-dev NAMESPACE: sharefly-dev
ACR_EE_NAMESPACE: sharefly-dev ACR_EE_NAMESPACE: sharefly-dev
only: only:
- develop - develop
script: script:
- echo "dev docker build" - echo "dev docker build"
- echo $ACR_EE_USERNAME - echo $ACR_EE_USERNAME
- echo $ACR_EE_REGISTRY - echo $ACR_EE_REGISTRY
- mvn package -Dmaven.test.skip=true --settings /usr/local/maven/conf/settings.xml
- docker login -u $ACR_EE_USERNAME -p 'MMC@2023&ACR' $ACR_EE_REGISTRY - docker login -u $ACR_EE_USERNAME -p 'MMC@2023&ACR' $ACR_EE_REGISTRY
- docker build -t ${ACR_EE_REGISTRY}/${ACR_EE_NAMESPACE}/${ACR_EE_IMAGE}:${TAG} . - docker build -t ${ACR_EE_REGISTRY}/${ACR_EE_NAMESPACE}/${ACR_EE_IMAGE}:${TAG} .
- docker push "${ACR_EE_REGISTRY}/${ACR_EE_NAMESPACE}/${ACR_EE_IMAGE}:${TAG}" - docker push "${ACR_EE_REGISTRY}/${ACR_EE_NAMESPACE}/${ACR_EE_IMAGE}:${TAG}"
...@@ -53,7 +45,6 @@ docker_build_prod: ...@@ -53,7 +45,6 @@ docker_build_prod:
- echo "prod docker build" - echo "prod docker build"
- echo $ACR_EE_USERNAME - echo $ACR_EE_USERNAME
- echo $ACR_EE_REGISTRY - echo $ACR_EE_REGISTRY
- mvn package -Dmaven.test.skip=true --settings /usr/local/maven/conf/settings.xml
- docker login -u $ACR_EE_USERNAME -p 'MMC@2023&ACR' $ACR_EE_REGISTRY - docker login -u $ACR_EE_USERNAME -p 'MMC@2023&ACR' $ACR_EE_REGISTRY
- docker build -t ${ACR_EE_REGISTRY}/${ACR_EE_NAMESPACE}/${ACR_EE_IMAGE}:${TAG} . - docker build -t ${ACR_EE_REGISTRY}/${ACR_EE_NAMESPACE}/${ACR_EE_IMAGE}:${TAG} .
- docker push "${ACR_EE_REGISTRY}/${ACR_EE_NAMESPACE}/${ACR_EE_IMAGE}:${TAG}" - docker push "${ACR_EE_REGISTRY}/${ACR_EE_NAMESPACE}/${ACR_EE_IMAGE}:${TAG}"
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<template> <template>
<view class="electronic-contracting"> <view class="electronic-contracting">
<image <image
src="http://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/36396951-5948-430e-9a34-9cc8694d8408.png" src="http://share-fly.oss-cn-hangzhou.aliyuncs.com/file/36396951-5948-430e-9a34-9cc8694d8408.png"
mode="widthFix" mode="widthFix"
/> />
</view> </view>
......
...@@ -190,7 +190,7 @@ import weChatSDK from 'z-weixin-ts' ...@@ -190,7 +190,7 @@ import weChatSDK from 'z-weixin-ts'
currentItem: {}, currentItem: {},
icon: { icon: {
type: 'image', type: 'image',
image: 'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/b0364bd1-f193-4b93-ac9f-cfb6e2624d6b.png', image: 'https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/b0364bd1-f193-4b93-ac9f-cfb6e2624d6b.png',
size: [32, 32], size: [32, 32],
anchor: 'bottom-center', anchor: 'bottom-center',
}, },
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论