mirror of
https://github.com/m1k1o/neko.git
synced 2025-05-01 11:26:21 +02:00
fix build.
This commit is contained in:
parent
6fbdea979f
commit
3cacb903f3
1 changed files with 9 additions and 31 deletions
26
build
26
build
|
@ -18,42 +18,20 @@ else
|
||||||
BASE_IMAGE="$BUILD_IMAGE:base"
|
BASE_IMAGE="$BUILD_IMAGE:base"
|
||||||
fi
|
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
|
|
||||||
|
|
||||||
function docker_image_exists() {
|
|
||||||
[ "$(docker images -q $1 2> /dev/null)" != "" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
if ! docker_image_exists neko-xorg-deps; then
|
|
||||||
echo "Building neko-xorg-deps image"
|
echo "Building neko-xorg-deps image"
|
||||||
docker build -t neko-xorg-deps runtime/xorg-deps/
|
docker build -t neko-xorg-deps runtime/xorg-deps/
|
||||||
else
|
|
||||||
echo "neko-xorg-deps image already exists"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! docker_image_exists neko-server; then
|
|
||||||
echo "Building neko-server image"
|
echo "Building neko-server image"
|
||||||
docker build -t neko-server server/
|
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"
|
echo "Building neko-client image"
|
||||||
docker build -t neko-client client/
|
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/
|
docker build -t $RUNTIME_IMAGE -f runtime/Dockerfile.$FLAVOUR runtime/
|
||||||
else
|
else
|
||||||
echo "$RUNTIME_IMAGE image already exists"
|
docker build -t $RUNTIME_IMAGE runtime/
|
||||||
fi
|
fi
|
||||||
|
|
||||||
docker build -t $BASE_IMAGE -f - . <<EOF
|
docker build -t $BASE_IMAGE -f - . <<EOF
|
||||||
|
|
Loading…
Add table
Reference in a new issue