fix server dev.

This commit is contained in:
Miroslav Šedivý 2025-04-03 14:17:59 +02:00
parent ec44bf0e04
commit 68e23fa8e7
5 changed files with 12 additions and 12 deletions

View file

@ -9,10 +9,10 @@ GIT_COMMIT=`git rev-parse --short HEAD`
GIT_BRANCH=`git rev-parse --symbolic-full-name --abbrev-ref HEAD`
echo "Building server image"
docker build -t neko_server --build-arg "GIT_COMMIT=$GIT_COMMIT" --build-arg "GIT_BRANCH=$GIT_BRANCH" -f ../Dockerfile ..
docker build -t neko_server:src -f ../Dockerfile ..
echo "Building base image"
../../build -y -b neko_server -t base -f "$1"
../../build -y -b neko_server:base -f "$1"
echo "Building app image"
docker build -t neko_server:app --build-arg "BASE_IMAGE=neko_server:base" -f ./runtime/Dockerfile ./runtime

View file

@ -1,12 +1,12 @@
#!/bin/bash
cd "$(dirname "$0")"
if [ "$(docker images -q neko_server 2> /dev/null)" == "" ]; then
echo "Image 'neko_server' not found. Run ./build first."
if [ "$(docker images -q neko_server:src 2> /dev/null)" == "" ]; then
echo "Image 'neko_server:src' not found. Run ./build first."
exit 1
fi
docker run -it --rm \
--entrypoint="go" \
-v "${PWD}/../:/src" \
neko_server fmt ./...
neko_server:src fmt ./...

View file

@ -1,8 +1,8 @@
#!/bin/bash
cd "$(dirname "$0")"
if [ "$(docker images -q neko_server 2> /dev/null)" == "" ]; then
echo "Image 'neko_server' not found. Run ./build first."
if [ "$(docker images -q neko_server:src 2> /dev/null)" == "" ]; then
echo "Image 'neko_server:src' not found. Run ./build first."
exit 1
fi
@ -10,7 +10,7 @@ docker run -it \
--name "neko_server_go" \
--entrypoint="go" \
-v "${PWD}/../:/src" \
neko_server "$@";
neko_server:src "$@";
#
# copy package files
docker cp neko_server_go:/src/go.mod "../go.mod"

View file

@ -1,8 +1,8 @@
#!/bin/bash
cd "$(dirname "$0")"
if [ "$(docker images -q neko_server 2> /dev/null)" == "" ]; then
echo "Image 'neko_server' not found. Run ./build first."
if [ "$(docker images -q neko_server:src 2> /dev/null)" == "" ]; then
echo "Image 'neko_server:src' not found. Run ./build first."
exit 1
fi
@ -11,4 +11,4 @@ fi
docker run --rm -it \
-v "${PWD}/../:/src" \
--entrypoint="/bin/bash" \
neko_server -c '[ -f ./bin/golangci-lint ] || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.31.0;./bin/golangci-lint run';
neko_server:src -c '[ -f ./bin/golangci-lint ] || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.31.0;./bin/golangci-lint run';

View file

@ -10,7 +10,7 @@ set -e
docker run --rm -it \
-v "${PWD}/../:/src" \
--entrypoint="/bin/bash" \
neko_server "./build" "$@";
neko_server:src "./build" "$@";
#
# remove old plugins