Skip to content

Commit 5f62974

Browse files
committed
feat(builder): look for DEIS_OUTSIDE_STORAGE_{HOST,PORT} environment var
if an operator launches a builder with this environment variable and does not have a minio service running, builder will do the following: 1. use the mc tool to upload the tarball to “http://$DEIS_OUTSIDE_STORAGE_HOST:${DEIS_OUTSIDE_STORAGE_PORT}” 2. Instantiate a slugbuilder with TAR_URL the same as above HTTPS support forthcoming
1 parent 33e16e5 commit 5f62974

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

rootfs/etc/confd/templates/builder

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ else
7474
PROCFILE="{}"
7575
fi
7676

77-
if [[ ! -f /var/run/secrets/object/store/access-key-id ]]; then
77+
if [[ ! -f /var/run/secrets/object/store/access-key-id ]]; then
7878
if $USING_DOCKERFILE ; then
7979
l1=`grep -n "object-store" /etc/deis-dockerbuilder.yaml | head -n1 |cut -d ":" -f1`
8080
l2=$(($l1+3))
@@ -101,6 +101,8 @@ git archive --format=tar.gz ${GIT_SHA} > ${APP_NAME}.tar.gz
101101
# TODO: figure out something for using S3 also
102102
if [[ -n "$DEIS_MINIO_SERVICE_HOST" && -n "$DEIS_MINIO_SERVICE_PORT" ]]; then
103103
S3EP=${DEIS_MINIO_SERVICE_HOST}:${DEIS_MINIO_SERVICE_PORT}
104+
elif [[ -n "$DEIS_OUTSIDE_STORAGE_HOST" && -n "$DEIS_OUTSIDE_STORAGE_HOST" ]]; then
105+
S3EP=${DEIS_OUTSIDE_STORAGE_HOST}:${DEIS_OUTSIDE_STORAGE_HOST}
104106
elif [ -z "$S3EP" ]; then
105107
S3EP=${HOST}:3000
106108
fi

0 commit comments

Comments
 (0)