safebox/installer-tool
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor changesx

Browse Source
This commit is contained in:
Gyorgy Berenyi
2022-09-02 15:15:09 +00:00
parent dbf250f407
commit 295f0ad14f
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
deploy.sh
View File

@@ -50,17 +50,17 @@ for i in $(echo $PROXY_TYPE); do
PROXY_SCHEDULER_FILE=smarthost-proxy-scheduler.json PROXY_SCHEDULER_FILE=smarthost-proxy-scheduler.json
fi fi
PROXY_SCHEDULER_NAME=$(jq -r .containers[0].NAME /tmp/$i/$PROXY_SERVICE_FILE | cut -d "-" -f1) PROXY_SCHEDULER_NAME=$(jq -r .containers[0].NAME /tmp/$i/$PROXY_SCHEDULER_FILE | cut -d "-" -f1)
PROXY_SERVICE_FILE=$(jq -r .$PROXY_SCHEDULER_NAME.PROXY_SERVICE_FILE /tmp/$i/proxy_config) PROXY_SERVICE_FILE=$(jq -r .$PROXY_SCHEDULER_NAME.PROXY_SERVICE_FILE /tmp/$i/proxy_config)
SERVICE_DIR=$(jq -r .containers[0].VOLUMES[].SOURCE /tmp/$i/$PROXY_SERVICE_FILE |grep $PROXY_SERVICE_FILE | sed s/$PROXY_SERVICE_FILE//g) SERVICE_DIR=$(jq -r .containers[0].VOLUMES[].SOURCE /tmp/$i/$PROXY_SCHEDULER_FILE |grep $PROXY_SERVICE_FILE | sed s/$PROXY_SERVICE_FILE//g)
PROXY_CONFIG_DIR=$(jq -r .$PROXY_SCHEDULER_NAME.PROXY_CONFIG_DIR /tmp/$i/proxy_config) PROXY_CONFIG_DIR=$(jq -r .$PROXY_SCHEDULER_NAME.PROXY_CONFIG_DIR /tmp/$i/proxy_config)
PROXY_VOLUME=$(jq -r --arg DEST "$PROXY_CONFIG_DIR" '.containers[0].VOLUMES[] | select(.DEST==$DEST)' /tmp/$i/$PROXY_SERVICE_FILE) PROXY_VOLUME=$(jq -r --arg DEST "$PROXY_CONFIG_DIR" '.containers[0].VOLUMES[] | select(.DEST==$DEST)' /tmp/$i/$PROXY_SCHEDULER_FILE)
PROXY_DIR=$(echo $PROXY_VOLUME | jq -r .SOURCE) PROXY_DIR=$(echo $PROXY_VOLUME | jq -r .SOURCE)
PROXY_DIR=$(dirname $PROXY_DIR | sed s/$i//g) PROXY_DIR=$(dirname $PROXY_DIR | sed s/$i//g)
DOMAIN_CONFIG_DIR=$(jq -r .$PROXY_SCHEDULER_NAME.DOMAIN_DIR /tmp/$i/proxy_config) DOMAIN_CONFIG_DIR=$(jq -r .$PROXY_SCHEDULER_NAME.DOMAIN_DIR /tmp/$i/proxy_config)
DOMAIN_VOLUME=$(jq -r --arg DEST "$DOMAIN_CONFIG_DIR" '.containers[0].VOLUMES[] | select(.DEST==$DEST)' /tmp/$i/$PROXY_SERVICE_FILE) DOMAIN_VOLUME=$(jq -r --arg DEST "$DOMAIN_CONFIG_DIR" '.containers[0].VOLUMES[] | select(.DEST==$DEST)' /tmp/$i/$PROXY_SCHEDULER_FILE)
DOMAIN_DIR=$(echo $DOMAIN_VOLUME | jq -r .SOURCE) DOMAIN_DIR=$(echo $DOMAIN_VOLUME | jq -r .SOURCE)
mkdir -p $SERVICE_DIR; mkdir -p $SERVICE_DIR;
@@ -119,13 +119,15 @@ for i in $(echo $PROXY_TYPE); do
fi fi
if [ "$i" == "smarthost-proxy" ]; then if [ "$i" == "smarthost-proxy" ]; then
git clone ssh://$GIT_REPO/$ORGANIZATION/$PROXY_DNS.git /tmp/$PROXY_DNS
# COPY PROXY DNS FILES # COPY PROXY DNS FILES
if [ "$PROXY_DNS" == "" ]; then if [ "$PROXY_DNS" == "" ]; then
PROXY_DNS=proxy-dns PROXY_DNS=proxy-dns
fi fi
git clone ssh://$GIT_REPO/$ORGANIZATION/$PROXY_DNS.git /tmp/$PROXY_DNS
DNS_VOLUMES=$(jq -r .containers[].VOLUMES[].SOURCE /tmp/$i/$PROXY_DNS.json |grep -v '\.') DNS_VOLUMES=$(jq -r .containers[].VOLUMES[].SOURCE /tmp/$i/$PROXY_DNS.json |grep -v '\.')
for VOLUME in $(echo $DNS_VOLUMES); do for VOLUME in $(echo $DNS_VOLUMES); do

2
entrypoint.sh
View File

@@ -50,4 +50,4 @@ fi
sh /deploy.sh sh /deploy.sh
echo "Successfully deployed $PUBLIC_PROXY $SMARTHOST_PROXY" echo "Successfully deployed $PROXY_TYPE"