diff --git a/Dockerfile b/Dockerfile index 1746854..e381543 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ RUN apk add --no-cache make python3 imagemagick COPY . /build WORKDIR /build -RUN make venv +RUN make clean RUN make build FROM nginx:alpine diff --git a/Makefile b/Makefile index e328887..922705e 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ BUILDDIR?=../ungleich-staticcms-build DESTINATION=ungleichstatic@staticweb.ungleich.ch:/home/services/www/ungleichstatic/staticcms.ungleich.ch/www/u/ -VENV_PATH=../venv +VENV_PATH=./venv VERSION=$(shell git describe --always) ARGOCD_HOME=$$HOME/vcs/k8s-config/cluster/p10/apps/templates/ ARGOCD_YAML=staticweb-ungleich.yaml @@ -52,4 +52,4 @@ permissions: build find $(BUILDDIR) -type d -exec chmod 0755 {} \; clean: - rm -rf $(BUILDDIR) + rm -rf $(BUILDDIR) $(VENV_PATH)