fix .public
This commit is contained in:
parent
517659ae3d
commit
64ce84c731
14
build-web.sh
14
build-web.sh
|
@ -1,8 +1,18 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
WORKBASE=/home/jenkins/go/src/infini.sh/console
|
WORKBASE=/home/jenkins/go/src/infini.sh/console
|
||||||
|
|
||||||
|
if [ -d $WORKBASE/.public ]; then
|
||||||
|
rm -rf $WORKBASE/.public
|
||||||
|
fi
|
||||||
|
|
||||||
if [ ! -d $WORKBASE/web ]; then
|
if [ ! -d $WORKBASE/web ]; then
|
||||||
git clone ssh://git@git.infini.ltd:64221/infini/console-ui.git web
|
git clone ssh://git@git.infini.ltd:64221/infini/console-ui.git web
|
||||||
fi
|
fi
|
||||||
cd $WORKBASE/web && git pull origin master && git stash
|
|
||||||
cnpm install && cnpm run build
|
cd $WORKBASE/web
|
||||||
|
git pull origin master
|
||||||
|
|
||||||
|
cnpm install
|
||||||
|
|
||||||
|
cnpm run build
|
||||||
|
|
12
build.sh
12
build.sh
|
@ -8,12 +8,6 @@ WORKDIR=$WORKBASE/$PNAME
|
||||||
if [[ $VERSION =~ NIGHTLY ]]; then
|
if [[ $VERSION =~ NIGHTLY ]]; then
|
||||||
BUILD_NUMBER=$BUILD_DAY
|
BUILD_NUMBER=$BUILD_DAY
|
||||||
fi
|
fi
|
||||||
if [[ -d $WORKBASE/.public ]]; then
|
|
||||||
rm -rf $WORKBASE/.public
|
|
||||||
fi
|
|
||||||
if [[ -d $WORKDIR/.public ]]; then
|
|
||||||
mv $WORKDIR/.public $WORKBASE
|
|
||||||
fi
|
|
||||||
export DOCKER_CLI_EXPERIMENTAL=enabled
|
export DOCKER_CLI_EXPERIMENTAL=enabled
|
||||||
|
|
||||||
#clean all
|
#clean all
|
||||||
|
@ -35,18 +29,15 @@ cp -rf $WORKBASE/framework/LICENSE $WORKDIR/bin && cat $WORKBASE/framework/NOTIC
|
||||||
|
|
||||||
cd $WORKDIR/bin
|
cd $WORKDIR/bin
|
||||||
for t in 386 amd64 arm64 armv5 armv6 armv7 loong64 mips mips64 mips64le mipsle riscv64 ; do
|
for t in 386 amd64 arm64 armv5 armv6 armv7 loong64 mips mips64 mips64le mipsle riscv64 ; do
|
||||||
echo "package-linux-$t"
|
|
||||||
tar zcf ${WORKSPACE}/$PNAME-$VERSION-$BUILD_NUMBER-linux-$t.tar.gz "${PNAME}-linux-$t" $PNAME.yml LICENSE NOTICE
|
tar zcf ${WORKSPACE}/$PNAME-$VERSION-$BUILD_NUMBER-linux-$t.tar.gz "${PNAME}-linux-$t" $PNAME.yml LICENSE NOTICE
|
||||||
done
|
done
|
||||||
|
|
||||||
for t in mac-amd64 mac-arm64 windows-amd64 windows-386 ; do
|
for t in mac-amd64 mac-arm64 windows-amd64 windows-386 ; do
|
||||||
echo "package-$t"
|
|
||||||
cd $WORKDIR/bin && zip -qr ${WORKSPACE}/$PNAME-$VERSION-$BUILD_NUMBER-$t.zip $PNAME-$t $PNAME.yml LICENSE NOTICE
|
cd $WORKDIR/bin && zip -qr ${WORKSPACE}/$PNAME-$VERSION-$BUILD_NUMBER-$t.zip $PNAME-$t $PNAME.yml LICENSE NOTICE
|
||||||
done
|
done
|
||||||
|
|
||||||
#build image & push
|
#build image & push
|
||||||
for t in amd64 arm64 ; do
|
for t in amd64 arm64 ; do
|
||||||
|
|
||||||
cat <<EOF>Dockerfile
|
cat <<EOF>Dockerfile
|
||||||
FROM --platform=linux/$t alpine:3.16.5
|
FROM --platform=linux/$t alpine:3.16.5
|
||||||
MAINTAINER "hardy <luohoufu@gmail.com>"
|
MAINTAINER "hardy <luohoufu@gmail.com>"
|
||||||
|
@ -61,9 +52,8 @@ CMD ["/opt/$PNAME/${PNAME}-linux-$t"]
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
docker buildx build -t infinilabs/$PNAME-$t:latest --platform=linux/$t -o type=docker .
|
docker buildx build -t infinilabs/$PNAME-$t:latest --platform=linux/$t -o type=docker .
|
||||||
|
|
||||||
docker tag infinilabs/$PNAME-$t:latest infinilabs/$PNAME-$t:$VERSION-$BUILD_NUMBER
|
|
||||||
docker push infinilabs/$PNAME-$t:latest
|
docker push infinilabs/$PNAME-$t:latest
|
||||||
|
docker tag infinilabs/$PNAME-$t:latest infinilabs/$PNAME-$t:$VERSION-$BUILD_NUMBER
|
||||||
docker push infinilabs/$PNAME-$t:$VERSION-$BUILD_NUMBER
|
docker push infinilabs/$PNAME-$t:$VERSION-$BUILD_NUMBER
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue