ww664853070
1 year ago
4 changed files with 69 additions and 66 deletions
@ -1,38 +1,31 @@ |
|||||
# FROM repository.anxinyun.cn/devops/node:12-dev as builder |
FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12-dev as builder |
||||
|
COPY ./api/ /var/app |
||||
# COPY . /var/app |
WORKDIR /var/app |
||||
|
EXPOSE 8080 |
||||
# WORKDIR /var/app |
RUN npm config set registry=https://nexus.ngaiot.com/repository/fs-npm/ |
||||
|
RUN echo "{\"time\":\"$BUILD_TIMESTAMP\",\"build\": \"$BUILD_NUMBER\",\"revision\": \"$SVN_REVISION_1\",\"URL\":\"$SVN_URL_1\"}" > version.json |
||||
# EXPOSE 8080 |
RUN npm cache clean -f |
||||
|
RUN rm -rf package-lock.json |
||||
# RUN npm config set registry=http://10.8.30.22:7000 |
RUN npm install --registry https://nexus.ngaiot.com/repository/fs-npm/ |
||||
# RUN echo "{\"time\":\"$BUILD_TIMESTAMP\",\"build\": \"$BUILD_NUMBER\",\"revision\": \"$SVN_REVISION_1\",\"URL\":\"$SVN_URL_1\"}" > version.json |
|
||||
# RUN npm cache clean -f |
|
||||
# RUN rm -rf package-lock.json |
|
||||
# RUN npm install --registry http://10.8.30.22:7000 |
|
||||
|
|
||||
# FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12 |
|
||||
|
|
||||
# COPY --from=builder --chown=node /var/app /home/node/app |
|
||||
|
|
||||
# WORKDIR /home/node/app |
|
||||
|
|
||||
# CMD ["node", "server.js"] |
FROM registry.cn-hangzhou.aliyuncs.com/fs-devops/node:12 |
||||
|
COPY --from=builder --chown=node /var/app /home/node/app |
||||
|
WORKDIR /home/node/app |
||||
|
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 |
||||
|
|
||||
MAINTAINER liuxinyi "liu.xinyi@free-sun.com.cn" |
# MAINTAINER liuxinyi "liu.xinyi@free-sun.com.cn" |
||||
|
|
||||
COPY . /var/app |
# COPY . /var/app |
||||
|
|
||||
WORKDIR /var/app |
# WORKDIR /var/app |
||||
|
|
||||
RUN npm cache clean -f && npm install --production --force --registry http://10.8.30.22:7000 |
# RUN npm cache clean -f && npm install --production --force --registry http://10.8.30.22:7000 |
||||
|
|
||||
RUN rm -rf package-lock.json |
# RUN rm -rf package-lock.json |
||||
|
|
||||
CMD [ "node", "server.js" ] |
# CMD [ "node", "server.js" ] |
@ -1,18 +1,21 @@ |
|||||
pipeline { |
podTemplate { |
||||
agent { |
node('pod-templ-jenkins-slave-common') { |
||||
node{ |
|
||||
label 'jnlp-slave' |
env.IMAGE_NAME = "${IOT_IMAGES_REGISTRY}/${pep}/${JOB_NAME}" |
||||
} |
env.IMAGE_NAME_SHORT = "${pep}/${JOB_NAME}" |
||||
} |
env.CODE_ADDR = "${GIT_ADDRESS}/free-sun/HumanResource.git" |
||||
|
|
||||
stages { |
stage('Run shell') { |
||||
stage('Testing hrm api......') { |
git branch: 'master', credentialsId: 'gitea-builder', url: "${CODE_ADDR}" |
||||
steps { |
|
||||
buildName '#${BUILD_NUMBER} ~/pep/${JOB_NAME}:${IMAGE_VERSION}' |
container('image-builder') { |
||||
buildDescription 'harbor.anxinyun.cn/pep/${JOB_NAME}:${IMAGE_VERSION}' |
sh''' |
||||
sh 'nerdctl build -t harbor.anxinyun.cn/pep/${JOB_NAME}:${IMAGE_VERSION} ./api' |
/kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./api/Dockerfile --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup |
||||
sh 'nerdctl push harbor.anxinyun.cn/pep/${JOB_NAME}:${IMAGE_VERSION}' |
''' |
||||
} |
} |
||||
|
|
||||
|
buildName "${IMAGE_NAME_SHORT}:${IMAGE_VERSION}" |
||||
|
buildDescription "${IMAGE_NAME}:${IMAGE_VERSION}" |
||||
} |
} |
||||
} |
} |
||||
} |
} |
@ -1,18 +1,25 @@ |
|||||
pipeline { |
podTemplate { |
||||
agent { |
node('pod-templ-jenkins-slave-common') { |
||||
node{ |
|
||||
label 'jnlp-slave' |
env.IMAGE_NAME = "${IOT_IMAGES_REGISTRY}/${PEP}/${JOB_NAME}" |
||||
} |
env.IMAGE_NAME_SHORT = "${PEP}/${JOB_NAME}" |
||||
} |
env.CODE_ADDR = "${GIT_ADDRESS}/free-sun/HumanResource.git" |
||||
|
|
||||
|
stage('Run shell') { |
||||
|
git branch: 'master', credentialsId: 'gitea-builder', url: "${CODE_ADDR}" |
||||
|
|
||||
stages { |
container('image-builder') { |
||||
stage('Testing hrm-web ......') { |
sh''' |
||||
steps { |
pwd |
||||
buildName "#${BUILD_NUMBER} ~/pep/${JOB_NAME}:${IMAGE_VERSION}" |
ls -al |
||||
buildDescription "harbor.anxinyun.cn/pep/${JOB_NAME}:${IMAGE_VERSION}" |
|
||||
sh 'nerdctl build -t harbor.anxinyun.cn/pep/${JOB_NAME}:${IMAGE_VERSION} ./web' |
/kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./web/Dockerfile --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup |
||||
sh 'nerdctl push harbor.anxinyun.cn/pep/${JOB_NAME}:${IMAGE_VERSION}' |
|
||||
|
''' |
||||
} |
} |
||||
|
|
||||
|
buildName "${IMAGE_NAME_SHORT}:${IMAGE_VERSION}" |
||||
|
buildDescription "${IMAGE_NAME}:${IMAGE_VERSION}" |
||||
} |
} |
||||
} |
} |
||||
} |
} |
Loading…
Reference in new issue