From 73f2b91b02601ac5e9cc2014c4f0436c2f80e695 Mon Sep 17 00:00:00 2001 From: johnwesley Date: Sat, 11 May 2019 20:12:16 -0400 Subject: [PATCH] modify algo for docker deploys --- Dockerfile | 1 + algo | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4dceab45..3094848a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,7 @@ FROM python:2-alpine ARG VERSION="git" ARG PACKAGES="bash libffi openssh-client openssl rsync tini" ARG BUILD_PACKAGES="gcc libffi-dev linux-headers make musl-dev openssl-dev" +ARG DOCKER_BUILD="docker" LABEL name="algo" \ version="${VERSION}" \ diff --git a/algo b/algo index 260c0e65..65ed8844 100755 --- a/algo +++ b/algo @@ -2,7 +2,7 @@ set -e -if [ -z ${VIRTUAL_ENV+x} ] +if [[ -z ${VIRTUAL_ENV+x} && -z ${DOCKER_BUILD+x} ]] then ACTIVATE_SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/env/bin/activate" if [ -f "$ACTIVATE_SCRIPT" ]