File tree Expand file tree Collapse file tree
rootfs/etc/confd/templates Expand file tree Collapse file tree Original file line number Diff line number Diff line change 9797
9898git archive --format=tar.gz ${GIT_SHA} > ${APP_NAME} .tar.gz
9999
100+ HTTP_PREFIX=" http"
100101# if minio is in the cluster, use it. otherwise use fetcher
101102# TODO: figure out something for using S3 also
102103if [[ -n " $DEIS_MINIO_SERVICE_HOST " && -n " $DEIS_MINIO_SERVICE_PORT " ]]; then
103104 S3EP=${DEIS_MINIO_SERVICE_HOST} :${DEIS_MINIO_SERVICE_PORT}
104105elif [[ -n " $DEIS_OUTSIDE_STORAGE_HOST " && -n " $DEIS_OUTSIDE_STORAGE_HOST " ]]; then
106+ HTTP_PREFIX=" https"
105107 S3EP=${DEIS_OUTSIDE_STORAGE_HOST} :${DEIS_OUTSIDE_STORAGE_HOST}
106108elif [ -z " $S3EP " ]; then
107109 S3EP=${HOST} :3000
108110fi
109111
110- TAR_URL=http ://$S3EP /git/home/${SLUG_NAME} /tar
111- PUSH_URL=http ://$S3EP /git/home/${SLUG_NAME} /push
112+ TAR_URL=$HTTP_PREFIX ://$S3EP /git/home/${SLUG_NAME} /tar
113+ PUSH_URL=$HTTP_PREFIX ://$S3EP /git/home/${SLUG_NAME} /push
112114
113115sed -i -- " s#repo_name#$META_NAME #g" /etc/${SLUG_NAME} .yaml
114116sed -i -- " s#puturl#$PUSH_URL #g" /etc/${SLUG_NAME} .yaml
@@ -122,8 +124,8 @@ cp $CERT_FILE /etc/ssl/certs/deis-minio-self-signed-cert.crt
122124mkdir -p /var/minio-conf
123125CONFIG_DIR=/var/minio-conf
124126MC_PREFIX=" mc -C $CONFIG_DIR --quiet"
125- $MC_PREFIX config host all " https ://$S3EP " $ACCESS_KEY $ACCESS_SECRET
126- $MC_PREFIX mb " ${S3EP} /git"
127+ $MC_PREFIX config host all " $HTTP_PREFIX ://$S3EP " $ACCESS_KEY $ACCESS_SECRET
128+ $MC_PREFIX mb " $HTTP_PREFIX :// $ {S3EP} /git"
127129$MC_PREFIX cp ${APP_NAME} .tar.gz $TAR_URL
128130echo " stored tarfile in $TAR_URL "
129131
You can’t perform that action at this time.
0 commit comments