diff --git a/Jenkinsfile b/Jenkinsfile index 6718d600..94c54669 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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' diff --git a/Jenkinsfile-docker b/Jenkinsfile-docker index c593846e..9b170f09 100644 --- a/Jenkinsfile-docker +++ b/Jenkinsfile-docker @@ -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' } diff --git a/docker/Dockerfile b/docker/Dockerfile index b2604efd..6e21f161 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -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"]