Skip to content

Commit

Permalink
Merge pull request #3631 from aasifkhan7/master
Browse files Browse the repository at this point in the history
DockerHub fix #2
  • Loading branch information
cdrini authored Aug 12, 2020
2 parents 24c2235 + b6b03af commit 61096f2
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,13 @@ js:
i18n:
$(PYTHON) ./scripts/i18n-messages compile

git:
git:
#Do not run these on DockerHub since it recursively clones all the repos before build initiates
ifeq ($(DOCKER_HUB),FALSE)
git submodule init
git submodule sync
git submodule update
endif

clean:
rm -rf $(BUILD)
Expand Down
2 changes: 2 additions & 0 deletions docker/Dockerfile.olbase
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
FROM ubuntu:xenial

ARG DOCKER_HUB=FALSE

ENV LANG en_US.UTF-8

# required for postgres
Expand Down
3 changes: 3 additions & 0 deletions docker/hooks/build
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash
cd ../
docker build -t $IMAGE_NAME --build-arg DOCKER_HUB=TRUE -f "$DOCKERFILE_PATH" .

0 comments on commit 61096f2

Please sign in to comment.