diff --git a/development.mk b/development.mk index 7e81738..688e70d 100644 --- a/development.mk +++ b/development.mk @@ -3,6 +3,22 @@ workon\ dev +EXTRA_MOUNTS := +ifdef ($(LOCAL_SPECIFICATION_PATH),) + EXTRA_MOUNTS += -v $(LOCAL_SPECIFICATION_PATH)/specification:/collection/specification +else ifeq ($(LOCAL_SPECIFICATION),1) + EXTRA_MOUNTS += -v $(PWD)/../specification/specificaiton:/collection/specification +endif + +ifdef ($(LOCAL_DL_PYTHON_PATH),) + EXTRA_MOUNTS += -v $(LOCAL_DL_PYTHON_PATH):/Src +else ifeq ($(LOCAL_DL_PYTHON),1) + EXTRA_MOUNTS += -v $(PWD)/../digital-land-python:/src +endif + +DOCKER_TAG=latest +ECR_URL=public.ecr.aws/l6z6v3j6/ + # useful when developing # export PIP_REQUIRE_VIRTUALENV=true @@ -25,3 +41,24 @@ prune:: makerules:: curl -qfsL '$(SOURCE_URL)/makerules/main/development.mk' > makerules/development.mk + +dockerised = docker run -t \ + -e LOCAL_USER_ID=$(shell id -u) \ + -v $(PWD):/pipeline \ + -v $(PWD)/local_collection:/data \ + $(EXTRA_MOUNTS) \ + --workdir /data \ + $(ECR_URL)digital-land-python:$(DOCKER_TAG) \ + digital-land \ + --specification-dir /collection/specification + +docker-pull:: +ifndef ($(DISABLE_DOCKER_PULL),) + docker pull $(ECR_URL)digital-land-python:$(DOCKER_TAG) +endif + +dockerised-fetch:: docker-pull + mkdir -p local_collection + $(dockerised) \ + fetch \ + '$(ENDPOINT_URL)' diff --git a/makerules.mk b/makerules.mk index 6f954eb..8b0a7cb 100644 --- a/makerules.mk +++ b/makerules.mk @@ -58,6 +58,7 @@ second-pass:: @: # initialise +ifeq (,$(wildcard /.dockerenv )) init:: pip install --upgrade pip ifneq (,$(wildcard requirements.txt)) @@ -66,6 +67,7 @@ endif ifneq (,$(wildcard setup.py)) pip install -e .$(PIP_INSTALL_PACKAGE) endif +endif submodules:: git submodule update --init --recursive --remote @@ -86,7 +88,6 @@ prune:: makerules:: curl -qfsL '$(SOURCE_URL)/makerules/main/makerules.mk' > makerules/makerules.mk -ifeq (,$(wildcard ./makerules/specification.mk)) # update local copies of specification files specification:: @mkdir -p specification/ @@ -101,6 +102,7 @@ specification:: curl -qfsL '$(SOURCE_URL)/specification/main/specification/pipeline.csv' > specification/pipeline.csv curl -qfsL '$(SOURCE_URL)/specification/main/specification/theme.csv' > specification/theme.csv +ifeq (,$(wildcard ./makerules/specification.mk)) init:: specification endif