replaced git clone to http
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
2025-02-11 13:12:24 +01:00
parent d99e7782a3
commit c3c686fced
3 changed files with 10 additions and 27 deletions

View File

@@ -1,6 +1,6 @@
FROM alpine:latest 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 config /root/.ssh/
COPY *.sh / COPY *.sh /

View File

@@ -8,11 +8,7 @@ if [ "$GIT_REPO" == "" ]; then
GIT_REPO=git.format.hu GIT_REPO=git.format.hu
fi fi
ORGANIZATION=$ORGANIZATION ORGANIZATION=${ORGANIZATION:-safebox}
if [ "$ORGANIZATION" == "" ]; then
ORGANIZATION=format
fi
SMARTHOST_PROXY=$(toUpperCase $SMARTHOST_PROXY) SMARTHOST_PROXY=$(toUpperCase $SMARTHOST_PROXY)
LOCAL_PROXY=$(toUpperCase $LOCAL_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 https://$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/$SERVICE_EXEC_REPO.git /tmp/$SERVICE_EXEC_REPO
if [[ "$LOCAL_PROXY" == "YES" || "$LOCAL_PROXY" == "TRUE" ]]; then if [[ "$LOCAL_PROXY" == "YES" || "$LOCAL_PROXY" == "TRUE" ]]; then
git clone ssh://$GIT_REPO/$ORGANIZATION/$LOCAL_PROXY_REPO.git /tmp/$LOCAL_PROXY_REPO git clone https://$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_BACKEND_REPO.git /tmp/$LOCAL_BACKEND_REPO
fi fi
if [[ "$VPN_PROXY" == "YES" || "$VPN_PROXY" == "TRUE" ]]; then 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 fi
if [[ "$CRON" == "YES" || "$CRON" == "TRUE" ]]; then 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 fi
# INSTALL PROXY SERVICES # INSTALL PROXY SERVICES
@@ -163,7 +159,7 @@ fi
for i in $(echo $PROXY_TYPE); do for i in $(echo $PROXY_TYPE); do
# Clone source files from git repository # 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 #if [ "$i" == "public-proxy" ] ; then

View File

@@ -22,10 +22,7 @@ if [ "$GIT_REPO" == "" ]; then
GIT_REPO=git.format.hu GIT_REPO=git.format.hu
fi fi
ORGANIZATION=$ORGANIZATION ORGANIZATION=${ORGANIZATION:-safebox}
if [ "$ORGANIZATION" == "" ]; then
ORGANIZATION=format
fi
SMARTHOST_PROXY=$(toUpperCase $SMARTHOST_PROXY) SMARTHOST_PROXY=$(toUpperCase $SMARTHOST_PROXY)
LOCAL_PROXY=$(toUpperCase $LOCAL_PROXY) LOCAL_PROXY=$(toUpperCase $LOCAL_PROXY)
@@ -43,17 +40,7 @@ if [ "$HOST" == "" ]; then
HOST=git.format.hu HOST=git.format.hu
fi 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" # Check git repository permissions"