update docker build jobs

This commit is contained in:
medcl 2022-01-25 21:17:38 +08:00
parent ff5ab00a19
commit 8d433bfe35
3 changed files with 5 additions and 23 deletions

1
Jenkinsfile vendored
View File

@ -21,7 +21,6 @@ pipeline {
sh 'cd /home/jenkins/go/src/infini.sh/console/ && git clone ssh://git@git.infini.ltd:64221/infini/console-ui.git web'
sh 'cd /home/jenkins/go/src/infini.sh/console/web && cnpm install'
sh 'cd /home/jenkins/go/src/infini.sh/console/web && cnpm run build'
sh 'cd /home/jenkins/go/src/infini.sh/console/web && mv static/* ../.public/static'
sh 'cd /home/jenkins/go/src/infini.sh/console && git stash && git pull origin master && make config build-linux'
sh 'cd /home/jenkins/go/src/infini.sh/console && git stash && git pull origin master && make config build-arm'
sh 'cd /home/jenkins/go/src/infini.sh/console && git stash && git pull origin master && make config build-darwin'

View File

@ -25,9 +25,9 @@ pipeline {
sh 'cd /home/jenkins/go/src/infini.sh/console/ && git clone ssh://git@git.infini.ltd:64221/infini/console-ui.git web'
sh 'cd /home/jenkins/go/src/infini.sh/console/web && cnpm install'
sh 'cd /home/jenkins/go/src/infini.sh/console/web && cnpm run build'
sh 'cd /home/jenkins/go/src/infini.sh/console/web && mv static/* ../.public/static'
sh 'cd /home/jenkins/go/src/infini.sh/console && git stash && git pull origin master && make config build && chmod a+x bin/console'
sh label: 'docker-build', script: 'cd /home/jenkins/go/src/infini.sh/ && docker build -t infini-console -f search-center/docker/Dockerfile .'
sh label: 'docker-build', script: 'cd /home/jenkins/go/src/infini.sh/bin && docker build -t infini-console -f ../docker/Dockerfile .'
sh label: 'docker-tagging', script: 'docker tag infini-console infinilabs/console:latest && docker tag infini-console infinilabs/console:$VERSION-$BUILD_NUMBER'
sh label: 'docker-push', script: 'docker push infinilabs/console:$VERSION-$BUILD_NUMBER && docker push infinilabs/console:latest'
}

View File

@ -1,23 +1,6 @@
FROM golang:alpine
FROM scratch
RUN apk update \
&& apk add --no-cache shadow git bash perl openssh vim tar curl python3 python3-dev py-pip gcc g++ libcurl make\
&& usermod -s /bin/bash root \
&& rm -rf /var/cache/apk/*
COPY ./console /console
COPY ./console.yml /console.yml
RUN mkdir -p /go/src/infini.sh
WORKDIR /go/src/infini.sh/
COPY ./framework /go/src/infini.sh/framework
COPY ./search-center /go/src/infini.sh/console
COPY ./license /go/src/infini.sh/license
COPY ./vendor /go/src/infini.sh/vendor
RUN cd search-center && OFFLINE_BUILD=true make config build
RUN chmod a+x /go/src/infini.sh/console/bin/console
FROM alpine:latest
WORKDIR /
COPY --from=0 /go/src/infini.sh/console/bin/console /console
COPY --from=0 /go/src/infini.sh/console/bin/console.yml /console.yml
CMD ["/console"]