refactor: merge into single multi stage dockerfile

Author: oliver-ni

Dockerfile

@@ -1,6 +1,6 @@
 # A base ocfweb Dockerfile containing the code and dependencies.
 # This doesn't run the website or the background worker; see Dockerfile.* for those.
-FROM docker.ocf.berkeley.edu/theocf/debian:bullseye
+FROM theocf/debian:bullseye-py AS base
 
 RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -51,3 +51,44 @@ ENV OCFWEB_TESTING 1
 WORKDIR /opt/ocfweb
 
 CMD ["runsvdir", "/opt/ocfweb/services"]
+
+##########
+# static #
+##########
+
+FROM base AS static
+
+RUN /opt/ocfweb/venv/bin/pysassc /opt/ocfweb/ocfweb/static/scss/site.scss /opt/ocfweb/ocfweb/static/scss/site.scss.css
+RUN find /opt/ocfweb/ocfweb/ \( -name '*.js' -o -name '*.css' \) -exec yui-compressor -o {} {} \;
+RUN mkdir /opt/ocfweb/static
+ENV OCFWEB_STATIC_ROOT /opt/ocfweb/static
+RUN /opt/ocfweb/venv/bin/python /opt/ocfweb/manage.py collectstatic --noinput
+
+COPY services/static /opt/ocfweb/services/static
+RUN chown -R nobody:nogroup /opt/ocfweb/services
+
+USER nobody
+
+#######
+# web #
+#######
+
+FROM base as web
+
+COPY services/web /opt/ocfweb/services/
+RUN chown -R nobody:nogroup /opt/ocfweb/services
+
+USER nobody
+
+##########
+# worker #
+##########
+
+FROM base as worker
+
+COPY services/worker /opt/ocfweb/services/worker
+RUN chown -R nobody:nogroup /opt/ocfweb/services
+
+USER nobody
+
+# vim: ft=Dockerfile

Dockerfile.static.in

@@ -5,7 +5,6 @@ RANDOM_PORT := $(shell expr $$(( 8000 + (`id -u` % 1000) )))
 LISTEN_IP := 0.0.0.0
 DOCKER_REPO ?= docker-push.ocf.berkeley.edu/
 DOCKER_REVISION ?= testing-$(USER)
-DOCKER_TAG_BASE = ocfweb-base-$(USER)
 DOCKER_TAG_WEB = $(DOCKER_REPO)ocfweb-web:$(DOCKER_REVISION)
 DOCKER_TAG_WORKER = $(DOCKER_REPO)ocfweb-worker:$(DOCKER_REVISION)
 DOCKER_TAG_STATIC = $(DOCKER_REPO)ocfweb-static:$(DOCKER_REVISION)
@@ -20,17 +19,13 @@ test: venv mypy
 mypy: venv
 	$(BIN)/mypy -p ocfweb
 
-.PHONY: Dockerfile.%
-Dockerfile.%: Dockerfile.%.in
-	sed 's/{tag}/$(DOCKER_TAG_BASE)/g' "$<" > "$@"
-
 .PHONY: cook-image
-cook-image: Dockerfile.web Dockerfile.worker Dockerfile.static
+cook-image:
 	$(eval OCFLIB_VERSION := ==$(shell curl https://pypi.org/pypi/ocflib/json | jq -r .info.version))
-	docker build --pull --build-arg ocflib_version=$(OCFLIB_VERSION) -t $(DOCKER_TAG_BASE) .
-	docker build -t $(DOCKER_TAG_WEB) -f Dockerfile.web .
-	docker build -t $(DOCKER_TAG_WORKER) -f Dockerfile.worker .
-	docker build -t $(DOCKER_TAG_STATIC) -f Dockerfile.static .
+	docker build --pull --build-arg ocflib_version=$(OCFLIB_VERSION) --target base .
+	docker build -t $(DOCKER_TAG_WEB) --target web .
+	docker build -t $(DOCKER_TAG_WORKER) --target worker .
+	docker build -t $(DOCKER_TAG_STATIC) --target static .
 
 .PHONY: push-image
 push-image: