diff --git a/Dockerfile b/Dockerfile index 20e7971..90c4f29 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:latest -RUN apk --update --no-cache add git openssh-client jq +RUN apk --update --no-cache add git openssl ca-certificates jq COPY config /root/.ssh/ COPY *.sh / diff --git a/deploy.sh b/deploy.sh index 504a454..0a956d1 100755 --- a/deploy.sh +++ b/deploy.sh @@ -8,11 +8,7 @@ if [ "$GIT_REPO" == "" ]; then GIT_REPO=git.format.hu fi -ORGANIZATION=$ORGANIZATION - -if [ "$ORGANIZATION" == "" ]; then - ORGANIZATION=format -fi +ORGANIZATION=${ORGANIZATION:-safebox} SMARTHOST_PROXY=$(toUpperCase $SMARTHOST_PROXY) LOCAL_PROXY=$(toUpperCase $LOCAL_PROXY) @@ -142,20 +138,20 @@ install_additionals() { } -git clone ssh://$GIT_REPO/$ORGANIZATION/$CORE_DNS.git /tmp/$CORE_DNS -git clone ssh://$GIT_REPO/$ORGANIZATION/$SERVICE_EXEC_REPO.git /tmp/$SERVICE_EXEC_REPO +git clone https://$GIT_REPO/$ORGANIZATION/$CORE_DNS.git /tmp/$CORE_DNS +git clone https://$GIT_REPO/$ORGANIZATION/$SERVICE_EXEC_REPO.git /tmp/$SERVICE_EXEC_REPO if [[ "$LOCAL_PROXY" == "YES" || "$LOCAL_PROXY" == "TRUE" ]]; then - git clone ssh://$GIT_REPO/$ORGANIZATION/$LOCAL_PROXY_REPO.git /tmp/$LOCAL_PROXY_REPO - git clone ssh://$GIT_REPO/$ORGANIZATION/$LOCAL_BACKEND_REPO.git /tmp/$LOCAL_BACKEND_REPO + git clone https://$GIT_REPO/$ORGANIZATION/$LOCAL_PROXY_REPO.git /tmp/$LOCAL_PROXY_REPO + git clone https://$GIT_REPO/$ORGANIZATION/$LOCAL_BACKEND_REPO.git /tmp/$LOCAL_BACKEND_REPO fi if [[ "$VPN_PROXY" == "YES" || "$VPN_PROXY" == "TRUE" ]]; then - git clone ssh://$GIT_REPO/$ORGANIZATION/$VPN_PROXY_REPO.git /tmp/$VPN_PROXY_REPO + git clone https://$GIT_REPO/$ORGANIZATION/$VPN_PROXY_REPO.git /tmp/$VPN_PROXY_REPO fi if [[ "$CRON" == "YES" || "$CRON" == "TRUE" ]]; then - git clone ssh://$GIT_REPO/$ORGANIZATION/$CRON_REPO.git /tmp/$CRON_REPO + git clone https://$GIT_REPO/$ORGANIZATION/$CRON_REPO.git /tmp/$CRON_REPO fi # INSTALL PROXY SERVICES @@ -163,7 +159,7 @@ fi for i in $(echo $PROXY_TYPE); do # Clone source files from git repository - git clone ssh://$GIT_REPO/$ORGANIZATION/$i.git /tmp/$i + git clone https://$GIT_REPO/$ORGANIZATION/$i.git /tmp/$i #if [ "$i" == "public-proxy" ] ; then diff --git a/entrypoint.sh b/entrypoint.sh index 42b938a..5e81a18 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -22,10 +22,7 @@ if [ "$GIT_REPO" == "" ]; then GIT_REPO=git.format.hu fi -ORGANIZATION=$ORGANIZATION -if [ "$ORGANIZATION" == "" ]; then - ORGANIZATION=format -fi +ORGANIZATION=${ORGANIZATION:-safebox} SMARTHOST_PROXY=$(toUpperCase $SMARTHOST_PROXY) LOCAL_PROXY=$(toUpperCase $LOCAL_PROXY) @@ -43,17 +40,7 @@ if [ "$HOST" == "" ]; then HOST=git.format.hu fi -if [ ! -f /root/.ssh/id_rsa ]; then - if [ -f /etc/user/data/installer ]; then - ln -s /etc/user/data/installer /root/.ssh/id_rsa; - fi -else - echo "id_rsa exists" -fi -sed -i "s/GIT_REPO/$GIT_REPO/g" /root/.ssh/config; -sed -i "s/HOST/$HOST/g" /root/.ssh/config; -sed -i "s/PORT/$PORT/g" /root/.ssh/config; # Check git repository permissions"