summaryrefslogtreecommitdiff
path: root/buildscripts
diff options
context:
space:
mode:
Diffstat (limited to 'buildscripts')
-rwxr-xr-xbuildscripts/build/build.sh2
-rwxr-xr-xbuildscripts/build/build_front.sh22
-rwxr-xr-xbuildscripts/build/build_server.sh20
-rwxr-xr-xbuildscripts/docker/build.sh8
-rwxr-xr-xbuildscripts/docker/deploy.sh68
5 files changed, 60 insertions, 60 deletions
diff --git a/buildscripts/build/build.sh b/buildscripts/build/build.sh
index 5930c00..90856f3 100755
--- a/buildscripts/build/build.sh
+++ b/buildscripts/build/build.sh
@@ -167,7 +167,7 @@ function build_server_nodes() {
copy_ssh_keys
for node_id in "${server_node_ids[@]}"
do
- build_server $node_id
+ build_server $node_id &
done
}
diff --git a/buildscripts/build/build_front.sh b/buildscripts/build/build_front.sh
index ed3cb8b..117f302 100755
--- a/buildscripts/build/build_front.sh
+++ b/buildscripts/build/build_front.sh
@@ -23,8 +23,8 @@ server {
# Grab deps
if [ $(which node) == "" ]
then
- curl -sSL https://deb.nodesource.com/setup_16.x | sudo bash -
- sudo apt install -y nodejs
+ curl -sSL https://deb.nodesource.com/setup_16.x | sudo bash -
+ sudo apt install -y nodejs
fi
[ "$(which git)" != "" ] || sudo apt install -y git
[ "$(which nginx)" != "" ] || sudo apt install -y nginx
@@ -32,16 +32,16 @@ fi
# Checkout source
if [ ! -d $chessh_path ]
then
- mkdir -p $chessh_path
- cd $chessh_path
- git init
- git remote add origin $chessh_source
- git pull origin
- git checkout main
- git config pull.rebase true
+ mkdir -p $chessh_path
+ cd $chessh_path
+ git init
+ git remote add origin $chessh_source
+ git pull origin
+ git checkout main
+ git config pull.rebase true
else
- cd $chessh_path
- git pull origin main
+ cd $chessh_path
+ git pull origin main
fi
# Build
diff --git a/buildscripts/build/build_server.sh b/buildscripts/build/build_server.sh
index 80e6e91..57a3a1c 100755
--- a/buildscripts/build/build_server.sh
+++ b/buildscripts/build/build_server.sh
@@ -9,22 +9,22 @@ chessh_path="$HOME/src/chessh"
[ "$(which git)" != "" ] || sudo apt install -y git
if [ "$(which docker)" = "" ]
then
- curl -sSL https://get.docker.com | sh
+ curl -sSL https://get.docker.com | sh
fi
# Checkout source
if [ ! -d $chessh_path ]
then
- mkdir -p $chessh_path
- cd $chessh_path
- git init
- git remote add origin $chessh_source
- git pull origin
- git checkout main
- git config pull.rebase true
+ mkdir -p $chessh_path
+ cd $chessh_path
+ git init
+ git remote add origin $chessh_source
+ git pull origin
+ git checkout main
+ git config pull.rebase true
else
- cd $chessh_path
- git pull origin main
+ cd $chessh_path
+ git pull origin main
fi
# Build
diff --git a/buildscripts/docker/build.sh b/buildscripts/docker/build.sh
index a33be21..5771384 100755
--- a/buildscripts/docker/build.sh
+++ b/buildscripts/docker/build.sh
@@ -7,7 +7,7 @@ export $(cat $env_file | xargs)
docker build ../.. -t chessh/server
docker build \
- --build-arg REACT_APP_DISCORD_OAUTH=${REACT_APP_DISCORD_OAUTH} \
- --build-arg REACT_APP_SSH_SERVER=${REACT_APP_SSH_SERVER} \
- --build-arg REACT_APP_SSH_PORT=${REACT_APP_SSH_PORT} \
- ../../front -t chessh/frontend
+ --build-arg REACT_APP_DISCORD_OAUTH=${REACT_APP_DISCORD_OAUTH} \
+ --build-arg REACT_APP_SSH_SERVER=${REACT_APP_SSH_SERVER} \
+ --build-arg REACT_APP_SSH_PORT=${REACT_APP_SSH_PORT} \
+ ../../front -t chessh/frontend
diff --git a/buildscripts/docker/deploy.sh b/buildscripts/docker/deploy.sh
index 8299aea..5b90c27 100755
--- a/buildscripts/docker/deploy.sh
+++ b/buildscripts/docker/deploy.sh
@@ -8,50 +8,50 @@ container_names=("chessh-redis" "chessh-database" "chessh-server" "chessh-fronte
export $(cat $env_file | xargs)
for name in ${container_names[@]}; do
- docker stop $name
- docker rm $name
+ docker stop $name
+ docker rm $name
done
docker network ls | grep -q $project_name || docker network create --driver bridge $project_name
docker volume ls | grep -q $project_name-redisdata || docker volume create $project_name-redisdata
docker run \
- -d \
- --restart unless-stopped \
- --env-file $env_file \
- --network $project_name \
- --name $project_name-redis \
- --net-alias redis \
- --volume $project_name-redisdata:/data/ \
- redis
+ -d \
+ --restart unless-stopped \
+ --env-file $env_file \
+ --network $project_name \
+ --name $project_name-redis \
+ --net-alias redis \
+ --volume $project_name-redisdata:/data/ \
+ redis
docker volume ls | grep -q $project_name-pgdata || docker volume create $project_name-pgdata
docker run \
- -d \
- --restart unless-stopped \
- --env-file $env_file \
- --network $project_name \
- --name $project_name-database \
- --net-alias database \
- --volume $project_name-pgdata:/var/lib/postgresql/data/ \
- postgres
+ -d \
+ --restart unless-stopped \
+ --env-file $env_file \
+ --network $project_name \
+ --name $project_name-database \
+ --net-alias database \
+ --volume $project_name-pgdata:/var/lib/postgresql/data/ \
+ postgres
docker run \
- -d \
- --restart unless-stopped \
- --env-file $env_file \
- --network $project_name \
- --name $project_name-server \
- --publish "${HOST}:${SSH_PORT}:${SSH_PORT}/tcp" \
- --net-alias server \
- chessh/server
+ -d \
+ --restart unless-stopped \
+ --env-file $env_file \
+ --network $project_name \
+ --name $project_name-server \
+ --publish "${HOST}:${SSH_PORT}:${SSH_PORT}/tcp" \
+ --net-alias server \
+ chessh/server
docker run \
- -d \
- --restart unless-stopped \
- --env-file $env_file \
- --network $project_name \
- --name $project_name-frontend \
- --publish "${HOST}:${WEB_PORT}:80/tcp" \
- --net-alias frontend \
- chessh/frontend
+ -d \
+ --restart unless-stopped \
+ --env-file $env_file \
+ --network $project_name \
+ --name $project_name-frontend \
+ --publish "${HOST}:${WEB_PORT}:80/tcp" \
+ --net-alias frontend \
+ chessh/frontend