wallenstein/algo
1
0
Fork 0
mirror of https://github.com/trailofbits/algo.git synced 2025-08-10 14:53:32 +02:00
Code Issues Projects Releases Wiki Activity

revert virtualenv changes

Browse source
This commit is contained in:
johnwesley 2019-06-22 11:55:13 -04:00
parent 91a44bf9d2
commit 565afc1798
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Dockerfile
View file

@ -18,6 +18,9 @@ WORKDIR /algo
COPY requirements.txt . COPY requirements.txt .
RUN apk --no-cache add ${BUILD_PACKAGES} && \ RUN apk --no-cache add ${BUILD_PACKAGES} && \
python -m pip --no-cache-dir install -U pip && \ python -m pip --no-cache-dir install -U pip && \
python -m pip --no-cache-dir install virtualenv && \
python -m virtualenv env && \
source env/bin/activate && \
python -m pip --no-cache-dir install -r requirements.txt && \ python -m pip --no-cache-dir install -r requirements.txt && \
apk del ${BUILD_PACKAGES} apk del ${BUILD_PACKAGES}
COPY . . COPY . .

1
Makefile
View file

@ -21,7 +21,6 @@ docker-deploy:
--cap-drop=all \ --cap-drop=all \
--rm \ --rm \
-it \ -it \
-e "DOCKER_BUILD=true" \
-v $(CONFIGURATIONS):/data \ -v $(CONFIGURATIONS):/data \
$(IMAGE):$(TAG) $(IMAGE):$(TAG)

2
algo
View file

@ -2,7 +2,7 @@
set -e set -e
if [[ -z ${VIRTUAL_ENV+x} && -z ${DOCKER_BUILD+x} ]] if [[ -z ${VIRTUAL_ENV+x} ]]
then then
ACTIVATE_SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/env/bin/activate" ACTIVATE_SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/env/bin/activate"
if [ -f "$ACTIVATE_SCRIPT" ] if [ -f "$ACTIVATE_SCRIPT" ]