fix build.

This commit is contained in:
Miroslav Šedivý 2024-09-08 19:57:50 +02:00
parent 6fbdea979f
commit 3cacb903f3

40
build
View file

@ -18,42 +18,20 @@ else
BASE_IMAGE="$BUILD_IMAGE:base"
fi
# if -f is passed, force rebuild
if [ "$1" == "-f" ]; then
echo "Forcing rebuild, removing existing images"
docker rmi neko-xorg-deps neko-server neko-client neko-runtime $BASE_IMAGE
fi
echo "Building neko-xorg-deps image"
docker build -t neko-xorg-deps runtime/xorg-deps/
function docker_image_exists() {
[ "$(docker images -q $1 2> /dev/null)" != "" ]
}
echo "Building neko-server image"
docker build -t neko-server server/
if ! docker_image_exists neko-xorg-deps; then
echo "Building neko-xorg-deps image"
docker build -t neko-xorg-deps runtime/xorg-deps/
else
echo "neko-xorg-deps image already exists"
fi
echo "Building neko-client image"
docker build -t neko-client client/
if ! docker_image_exists neko-server; then
echo "Building neko-server image"
docker build -t neko-server server/
else
echo "neko-server image already exists"
fi
if ! docker_image_exists neko-client; then
echo "Building neko-client image"
docker build -t neko-client client/
else
echo "neko-client image already exists"
fi
if ! docker_image_exists $RUNTIME_IMAGE; then
echo "Building $RUNTIME_IMAGE image"
echo "Building $RUNTIME_IMAGE image"
if [ "$FLAVOUR" != "" ]; then
docker build -t $RUNTIME_IMAGE -f runtime/Dockerfile.$FLAVOUR runtime/
else
echo "$RUNTIME_IMAGE image already exists"
docker build -t $RUNTIME_IMAGE runtime/
fi
docker build -t $BASE_IMAGE -f - . <<EOF