fix: rebase conflicts for multistage dockerfiles

hotosm · Nov 21, 2023 · 4291222 · 4291222
1 parent cb23f63
commit 4291222
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/docker/underpass-api.dockerfile b/docker/underpass-api.dockerfile
@@ -1,4 +1,5 @@
-FROM python:3.9
+ARG PYTHON_TAG=${PYTHON_TAG:-3.10}
+
 
 FROM docker.io/python:${PYTHON_TAG}-slim-bookworm as base
 ARG APP_VERSION

diff --git a/docker/underpass-ui.dockerfile b/docker/underpass-ui.dockerfile
@@ -1,6 +1,5 @@
-FROM node:alpine 
+ARG NODE_TAG=${NODE_TAG:-18}
 
-LABEL maintainer="Humanitarian OpenStreetMap Team" Description="This image provides the Underpass UI playground" Vendor="HOT" Version="dev"
 
 FROM docker.io/node:${NODE_TAG}-bookworm-slim as base
 ARG APP_VERSION

diff --git a/docker/underpass.dockerfile b/docker/underpass.dockerfile
@@ -1,5 +1,3 @@
-FROM ubuntu:latest
-
 FROM docker.io/debian:bookworm-slim as base
 ARG APP_VERSION
 ARG COMMIT_REF