42 changed files with 2473 additions and 2059 deletions
@ -1,36 +1,36 @@ |
|||||
# FROM repository.anxinyun.cn/devops/node:12-dev as builder |
FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12-dev as builder |
||||
|
|
||||
# COPY . /var/app |
COPY . /var/app |
||||
|
|
||||
# WORKDIR /var/app |
WORKDIR /var/app |
||||
|
|
||||
# EXPOSE 8080 |
EXPOSE 8080 |
||||
|
|
||||
# RUN npm config set registry=http://10.8.30.22:7000 |
RUN npm config set registry=http://10.8.30.22:7000 |
||||
# RUN echo "{\"time\":\"$BUILD_TIMESTAMP\",\"build\": \"$BUILD_NUMBER\",\"revision\": \"$SVN_REVISION_1\",\"URL\":\"$SVN_URL_1\"}" > version.json |
RUN echo "{\"time\":\"$BUILD_TIMESTAMP\",\"build\": \"$BUILD_NUMBER\",\"revision\": \"$SVN_REVISION_1\",\"URL\":\"$SVN_URL_1\"}" > version.json |
||||
# RUN npm cache clean -f |
RUN npm cache clean -f |
||||
# RUN rm -rf package-lock.json |
RUN rm -rf package-lock.json |
||||
# RUN npm install --registry http://10.8.30.22:7000 |
RUN npm install --registry http://10.8.30.22:7000 |
||||
|
|
||||
# FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12 |
FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12 |
||||
|
|
||||
# COPY --from=builder --chown=node /var/app /home/node/app |
COPY --from=builder --chown=node /var/app /home/node/app |
||||
|
|
||||
# WORKDIR /home/node/app |
WORKDIR /home/node/app |
||||
|
|
||||
# CMD ["node", "server.js"] |
CMD ["node", "server.js"] |
||||
|
|
||||
|
|
||||
# 旧版本构建方式 |
# 旧版本构建方式 |
||||
|
|
||||
FROM repository.anxinyun.cn/base-images/nodejs12:20.10.12.2 |
# FROM repository.anxinyun.cn/base-images/nodejs12:20.10.12.2 |
||||
|
|
||||
COPY . /var/app |
# COPY . /var/app |
||||
|
|
||||
WORKDIR /var/app |
# WORKDIR /var/app |
||||
|
|
||||
EXPOSE 8080 |
# EXPOSE 8080 |
||||
|
|
||||
CMD ["-u", "http://localhost:8088"] |
# CMD ["-u", "http://localhost:8088"] |
||||
|
|
||||
ENTRYPOINT [ "node", "server.js" ] |
# ENTRYPOINT [ "node", "server.js" ] |
||||
File diff suppressed because it is too large
@ -1,19 +1,19 @@ |
|||||
pipeline { |
pipeline { |
||||
agent { |
agent { |
||||
node{ |
node{ |
||||
label 'jnlp-slave' |
label 'jnlp-slave' |
||||
} |
} |
||||
} |
} |
||||
|
|
||||
stages { |
stages { |
||||
stage('Testing poms ......') { |
stage('Testing site......') { |
||||
steps { |
steps { |
||||
sh 'switch-auth.sh anxinyun' |
buildName "#${BUILD_NUMBER} ~/iot/${JOB_NAME}:${IMAGE_VERSION}" |
||||
buildName "#${BUILD_NUMBER} ~/fs-cloud/${JOB_NAME}:${IMAGE_VERSION}" |
buildDescription "harbor.anxinyun.cn/iot/${JOB_NAME}:${IMAGE_VERSION}" |
||||
buildDescription "registry.cn-hangzhou.aliyuncs.com/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION}" |
sh 'nerdctl build -t harbor.anxinyun.cn/iot/${JOB_NAME}:${IMAGE_VERSION} ./api' |
||||
sh 'docker build -t registry.cn-hangzhou.aliyuncs.com/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION} ./api' |
sh 'nerdctl push harbor.anxinyun.cn/iot/${JOB_NAME}:${IMAGE_VERSION}' |
||||
sh 'docker push registry.cn-hangzhou.aliyuncs.com/${CLOUD}/${JOB_NAME}:${IMAGE_VERSION}' |
|
||||
} |
} |
||||
} |
} |
||||
} |
} |
||||
} |
} |
||||
@ -0,0 +1,16 @@ |
|||||
|
alter table alarm_push_config |
||||
|
add alarm_sub_type jsonb; |
||||
|
|
||||
|
comment on column alarm_push_config.alarm_sub_type is '存对应监听模块(alarm_type)的子类( |
||||
|
数据告警：alarms.AlarmGroupUnit, |
||||
|
视频异常：camera.kind_id, |
||||
|
应用异常：app_alarm.errType |
||||
|
)'; |
||||
|
|
||||
|
|
||||
|
ALTER TABLE alarm_push_config ALTER COLUMN poms_project_id TYPE INTEGER [] |
||||
|
USING CASE |
||||
|
WHEN poms_project_id is NULL |
||||
|
then NULL |
||||
|
ELSE array [poms_project_id] |
||||
|
END ::INTEGER []; |
||||
@ -0,0 +1,4 @@ |
|||||
|
alter table alarm_push_config |
||||
|
add poms_struc_factor_id jsonb; |
||||
|
|
||||
|
comment on column alarm_push_config.poms_struc_factor_id is '结构物对应监测项 id'; |
||||
@ -0,0 +1,6 @@ |
|||||
|
ALTER TABLE email_send_log ALTER COLUMN project_correlation_id TYPE INTEGER [] |
||||
|
USING CASE |
||||
|
WHEN project_correlation_id is NULL |
||||
|
then NULL |
||||
|
ELSE array [project_correlation_id] |
||||
|
END ::INTEGER []; |
||||
@ -0,0 +1 @@ |
|||||
|
alter table latest_dynamic_list alter column project_correlation_id drop not null; |
||||
@ -1,40 +1,40 @@ |
|||||
# FROM repository.anxinyun.cn/devops/node:12-dev as builder |
FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12-dev as builder |
||||
|
|
||||
# COPY . /var/app |
COPY . /var/app |
||||
|
|
||||
# WORKDIR /var/app |
WORKDIR /var/app |
||||
|
|
||||
# EXPOSE 8080 |
EXPOSE 8080 |
||||
|
|
||||
# RUN npm config set registry=http://10.8.30.22:7000 |
RUN npm config set registry=http://10.8.30.22:7000 |
||||
# RUN echo "{\"time\":\"$BUILD_TIMESTAMP\",\"build\": \"$BUILD_NUMBER\",\"revision\": \"$SVN_REVISION_1\",\"URL\":\"$SVN_URL_1\"}" > version.json |
RUN echo "{\"time\":\"$BUILD_TIMESTAMP\",\"build\": \"$BUILD_NUMBER\",\"revision\": \"$SVN_REVISION_1\",\"URL\":\"$SVN_URL_1\"}" > version.json |
||||
# RUN npm cache clean -f |
RUN npm cache clean -f |
||||
# RUN npm install --registry http://10.8.30.22:7000 |
RUN npm install --registry http://10.8.30.22:7000 |
||||
# RUN npm run build |
RUN npm run build |
||||
# RUN rm -rf client/src |
RUN rm -rf client/src |
||||
# RUN rm -rf node_modules |
RUN rm -rf node_modules |
||||
# RUN npm install --production --registry http://10.8.30.22:7000 |
RUN npm install --production --registry http://10.8.30.22:7000 |
||||
|
|
||||
# FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node-16:7.22-06-20 |
FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node-16:7.22-06-20 |
||||
|
|
||||
# COPY --from=builder --chown=node /var/app /home/node/app |
COPY --from=builder --chown=node /var/app /home/node/app |
||||
|
|
||||
# WORKDIR /home/node/app |
WORKDIR /home/node/app |
||||
|
|
||||
# CMD ["node", "server.js"] |
CMD ["node", "server.js"] |
||||
|
|
||||
|
|
||||
# 旧版本构建方式 |
# 旧版本构建方式 |
||||
|
|
||||
|
|
||||
FROM repository.anxinyun.cn/base-images/nodejs12:20.10.12.2 |
# FROM repository.anxinyun.cn/base-images/nodejs12:20.10.12.2 |
||||
|
|
||||
COPY . /var/app |
# COPY . /var/app |
||||
|
|
||||
WORKDIR /var/app |
# WORKDIR /var/app |
||||
|
|
||||
EXPOSE 8080 |
# EXPOSE 8080 |
||||
|
|
||||
CMD ["-u", "http://localhost:8088"] |
# CMD ["-u", "http://localhost:8088"] |
||||
|
|
||||
ENTRYPOINT [ "node", "server.js" ] |
# ENTRYPOINT [ "node", "server.js" ] |
||||
|
After Width: | Height: | Size: 70 KiB |
|
After Width: | Height: | Size: 1.7 MiB |
File diff suppressed because it is too large
File diff suppressed because it is too large
Loading…
Reference in new issue