Add the missing srcdir and use bookworm for prod containers

Author: past

Makefile

@@ -204,10 +204,12 @@ package_service: var-APP_PATH
 	# Trim the potential "app.staging.yaml" suffix.
 	if [[ "$(APP_PATH)" == "api/query/cache/service"* ]]; then \
 		APP_PATH="api/query/cache/service"; \
+	elif [[ "$(APP_PATH)" == "webapp/web"* ]]; then \
+		APP_PATH="webapp/web"; \
 	else \
 		APP_PATH="$(APP_PATH)"; \
 	fi ; \
-	if [[ "$${APP_PATH}" == "api/query/cache/service" ]]; then \
+	if [[ "$${APP_PATH}" == "api/query/cache/service" || "$${APP_PATH}" == "webapp/web" ]]; then \
 		TMP_DIR=$$(mktemp -d); \
 		rm -rf $(WPTD_PATH)$${APP_PATH}/wpt.fyi; \
 		cp -r $(WPTD_PATH)* $${TMP_DIR}/; \
@@ -292,6 +294,7 @@ deploy_staging: deployment_state var-BRANCH_NAME
 		util/deploy.sh -q -b $(BRANCH_NAME) $(APP_PATH); \
 	fi
 	rm -rf $(WPTD_PATH)api/query/cache/service/wpt.fyi
+	rm -rf $(WPTD_PATH)webapp/web/wpt.fyi
 
 cleanup_staging_versions: gcloud_login
 	$(WPTD_PATH)/util/cleanup-versions.sh
@@ -300,6 +303,7 @@ deploy_production: deployment_state
 	gcloud config set project wptdashboard
 	util/deploy.sh -r $(APP_PATH)
 	rm -rf $(WPTD_PATH)api/query/cache/service/wpt.fyi
+	rm -rf $(WPTD_PATH)webapp/web/wpt.fyi
 
 webapp_node_modules_all: node
 	cd webapp; npm install

api/query/cache/service/Dockerfile

@@ -12,7 +12,7 @@ COPY $LOCAL_SRC .
 RUN CGO_ENABLED=0 /usr/local/go/bin/go build -o ../../bin/app ./api/query/cache/service
 
 # Application image.
-FROM gcr.io/distroless/static-debian11
+FROM gcr.io/distroless/static-debian12
 
 COPY --from=builder /go/bin/app /usr/local/bin/app
 

webapp/web/Dockerfile

@@ -12,8 +12,8 @@ COPY $LOCAL_SRC .
 RUN make go_build
 
 # Application image.
-FROM gcr.io/distroless/static-debian11
+FROM gcr.io/distroless/static-debian12
 
-COPY --from=builder /go/src/wpt.fyi/webapp/web /usr/local/bin/app
+COPY --from=builder /go/src/wpt.fyi/web /usr/local/bin/app
 
 CMD ["/usr/local/bin/app"]