build.sh does its own prune
parent
bca4f22eef
commit
3d2f3a92a5
|
|
@ -11,12 +11,7 @@ jobs:
|
|||
steps:
|
||||
- name: pull
|
||||
run: |
|
||||
was=$(docker images | grep registry-app.inhome.blapointe.com:5001/docker:latest | awk '{print $3}')
|
||||
docker pull registry-app.inhome.blapointe.com:5001/docker:latest
|
||||
new=$(docker images | grep registry-app.inhome.blapointe.com:5001/docker:latest | awk '{print $3}')
|
||||
if [ "$was" != "$new" ]; then
|
||||
docker rmi "$was"
|
||||
fi
|
||||
shell: sh
|
||||
cicd:
|
||||
name: cicd
|
||||
|
|
@ -24,20 +19,11 @@ jobs:
|
|||
steps:
|
||||
- name: cicd
|
||||
run: |
|
||||
was=$(docker images | grep registry-app.inhome.blapointe.com:5001/docker:latest | awk '{print $3}')
|
||||
|
||||
pwd
|
||||
ls
|
||||
find . -type d
|
||||
ps aux www
|
||||
echo clone ${{ gitea.repository }}
|
||||
git clone ${{ gitea.repository }}
|
||||
cd ./*/
|
||||
which git
|
||||
if ! sh ./build.sh; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
new=$(docker images | grep registry-app.inhome.blapointe.com:5001/docker:latest | awk '{print $3}')
|
||||
if [ "$was" != "$new" ]; then
|
||||
docker rmi "$was"
|
||||
fi
|
||||
|
|
|
|||
11
build.sh
11
build.sh
|
|
@ -2,9 +2,18 @@
|
|||
|
||||
img=registry-app.inhome.blapointe.com:5001/docker
|
||||
t=latest
|
||||
docker rmi $img:$t
|
||||
|
||||
set -e
|
||||
|
||||
get_sha() {
|
||||
docker inspect $img:$t | grep '"Id"' | awk '{print $NF}' | sed 's/^"sha256://' | sed 's/",$//'
|
||||
}
|
||||
|
||||
was=$(get_sha)
|
||||
docker build -f ./Dockerfile -t $img:$t --progress plain .
|
||||
docker push $img:$t
|
||||
now=$(get_sha)
|
||||
if [ -n "$was" ] && [ "$was" != "$now" ]; then
|
||||
echo pruning old $was
|
||||
docker rmi "$was"
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in New Issue