Update Docker image tag to devops for Linux-x64 platform

work7z · Mar 9, 2024 · c998abc · c998abc
1 parent 657728b
commit c998abc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/pipeline/build-all.sh b/pipeline/build-all.sh
@@ -233,10 +233,10 @@ build-bundle(){
             cp $LAFTOOLS_ROOT/pipeline/parcel/docker/* ./
             find . -iname "*.sh" -exec chmod 755 {} \;
             ls -ahlrt
-            docker build -t codegentoolbox/laftools-$platformName:$crtVersion -f ./Dockerfile .
-            docker push codegentoolbox/laftools-$platformName:$crtVersion
+            docker build -t codegentoolbox/laftools-$platformName:devops -f ./Dockerfile .
+            docker push codegentoolbox/laftools-$platformName:devops
             if [ $platformName == "linux-x64" ]; then
-                docker save codegentoolbox/laftools-$platformName:$crtVersion > $LAFTOOLS_ROOT/dkout.tmp
+                docker save codegentoolbox/laftools-$platformName:devops > $LAFTOOLS_ROOT/dkout.tmp 
                 zip -r $LAFTOOLS_ROOT/pipeline-server.zip $LAFTOOLS_ROOT/pipeline/server
                 gzip $LAFTOOLS_ROOT/dkout.tmp
                 echo "[I] docker output file: $LAFTOOLS_ROOT/dkout.tmp.gz, size is $(du -sh $LAFTOOLS_ROOT/dkout.tmp.gz | awk '{print $1}')"

diff --git a/pipeline/server/run.sh b/pipeline/server/run.sh
@@ -40,12 +40,11 @@ cp $targetPkg $runtimeDir/pre-release
 rm -rf $runtimeDir/release/*
 mv $runtimeDir/pre-release/* $runtimeDir/release
 
-set -e
 cd ~/runtime/release
 mv $targetPkg m.tmp.gz
 gunzip ./m.tmp.gz
 docker load -i ./m.tmp
-docker stop laft-inst3
+docker ps -a | grep laft-inst3 | awk '{print $1}' | xargs -I {} docker stop {}
 docker ps -a | grep laft-inst3 | awk '{print $1}' | xargs -I {} docker rm {}
-docker run --name laft-inst3 -d -p 0.0.0.0:81:39899 codegentoolbox/laftools-linux-x64:$crtVersion
-docker logs -f laft-inst3
+docker run --name laft-inst3 -d -p 0.0.0.0:80:39899 codegentoolbox/laftools-linux-x64:devops
+docker logs -f laft-inst3