mirror of
https://github.com/m1k1o/neko.git
synced 2025-06-06 04:42:47 +02:00
fix server dev.
This commit is contained in:
parent
ec44bf0e04
commit
68e23fa8e7
5 changed files with 12 additions and 12 deletions
|
@ -9,10 +9,10 @@ GIT_COMMIT=`git rev-parse --short HEAD`
|
||||||
GIT_BRANCH=`git rev-parse --symbolic-full-name --abbrev-ref HEAD`
|
GIT_BRANCH=`git rev-parse --symbolic-full-name --abbrev-ref HEAD`
|
||||||
|
|
||||||
echo "Building server image"
|
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"
|
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"
|
echo "Building app image"
|
||||||
docker build -t neko_server:app --build-arg "BASE_IMAGE=neko_server:base" -f ./runtime/Dockerfile ./runtime
|
docker build -t neko_server:app --build-arg "BASE_IMAGE=neko_server:base" -f ./runtime/Dockerfile ./runtime
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
cd "$(dirname "$0")"
|
cd "$(dirname "$0")"
|
||||||
|
|
||||||
if [ "$(docker images -q neko_server 2> /dev/null)" == "" ]; then
|
if [ "$(docker images -q neko_server:src 2> /dev/null)" == "" ]; then
|
||||||
echo "Image 'neko_server' not found. Run ./build first."
|
echo "Image 'neko_server:src' not found. Run ./build first."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
docker run -it --rm \
|
docker run -it --rm \
|
||||||
--entrypoint="go" \
|
--entrypoint="go" \
|
||||||
-v "${PWD}/../:/src" \
|
-v "${PWD}/../:/src" \
|
||||||
neko_server fmt ./...
|
neko_server:src fmt ./...
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
cd "$(dirname "$0")"
|
cd "$(dirname "$0")"
|
||||||
|
|
||||||
if [ "$(docker images -q neko_server 2> /dev/null)" == "" ]; then
|
if [ "$(docker images -q neko_server:src 2> /dev/null)" == "" ]; then
|
||||||
echo "Image 'neko_server' not found. Run ./build first."
|
echo "Image 'neko_server:src' not found. Run ./build first."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ docker run -it \
|
||||||
--name "neko_server_go" \
|
--name "neko_server_go" \
|
||||||
--entrypoint="go" \
|
--entrypoint="go" \
|
||||||
-v "${PWD}/../:/src" \
|
-v "${PWD}/../:/src" \
|
||||||
neko_server "$@";
|
neko_server:src "$@";
|
||||||
#
|
#
|
||||||
# copy package files
|
# copy package files
|
||||||
docker cp neko_server_go:/src/go.mod "../go.mod"
|
docker cp neko_server_go:/src/go.mod "../go.mod"
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
cd "$(dirname "$0")"
|
cd "$(dirname "$0")"
|
||||||
|
|
||||||
if [ "$(docker images -q neko_server 2> /dev/null)" == "" ]; then
|
if [ "$(docker images -q neko_server:src 2> /dev/null)" == "" ]; then
|
||||||
echo "Image 'neko_server' not found. Run ./build first."
|
echo "Image 'neko_server:src' not found. Run ./build first."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -11,4 +11,4 @@ fi
|
||||||
docker run --rm -it \
|
docker run --rm -it \
|
||||||
-v "${PWD}/../:/src" \
|
-v "${PWD}/../:/src" \
|
||||||
--entrypoint="/bin/bash" \
|
--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';
|
||||||
|
|
|
@ -10,7 +10,7 @@ set -e
|
||||||
docker run --rm -it \
|
docker run --rm -it \
|
||||||
-v "${PWD}/../:/src" \
|
-v "${PWD}/../:/src" \
|
||||||
--entrypoint="/bin/bash" \
|
--entrypoint="/bin/bash" \
|
||||||
neko_server "./build" "$@";
|
neko_server:src "./build" "$@";
|
||||||
|
|
||||||
#
|
#
|
||||||
# remove old plugins
|
# remove old plugins
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue