chore: Update Dockerfiles and base images

ds-wizard · Nov 5, 2024 · 9357b25 · 9357b25
1 parent 4f17b84
commit 9357b25
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 deletions.
diff --git a/packages/dsw-data-seeder/Dockerfile b/packages/dsw-data-seeder/Dockerfile
@@ -1,4 +1,4 @@
-FROM datastewardshipwizard/python-base:4.10.1-3.11-basic as builder
+FROM datastewardshipwizard/python-base:4.12.0-basic AS builder
 
 WORKDIR /app
 
@@ -15,12 +15,12 @@ RUN python -m pip wheel --no-cache-dir --wheel-dir=/app/wheels -r /app/packages/
  && python -m pip wheel --no-cache-dir --no-deps --wheel-dir=/app/wheels /app/packages/dsw-data-seeder
 
 
-FROM datastewardshipwizard/python-base:4.10.1-3.11-basic
+FROM datastewardshipwizard/python-base:4.12.0-basic
 
-ENV APPLICATION_CONFIG_PATH /app/config/application.yml
-ENV WORKDIR_PATH /home/user/data
-ENV SEEDER_RECIPE example
-ENV PATH "/home/user/.local/bin:$PATH"
+ENV APPLICATION_CONFIG_PATH=/app/config/application.yml \
+    WORKDIR_PATH=/home/user/data \
+    SEEDER_RECIPE=example \
+    PATH="/home/user/.local/bin:$PATH"
 
 # Setup non-root user
 USER user

diff --git a/packages/dsw-document-worker/Dockerfile b/packages/dsw-document-worker/Dockerfile
@@ -1,4 +1,4 @@
-FROM datastewardshipwizard/python-base:4.10.1-3.11-docworker as builder
+FROM datastewardshipwizard/python-base:4.12.0-docworker AS builder
 
 ARG TARGETARCH
 
@@ -17,11 +17,11 @@ RUN python -m pip wheel --wheel-dir=/app/wheels -r /app/packages/dsw-document-wo
  && python -m pip wheel --no-deps --wheel-dir=/app/wheels /app/packages/dsw-document-worker/addons/* \
  && python -m pip wheel --no-deps --wheel-dir=/app/wheels /app/packages/dsw-document-worker
 
-FROM datastewardshipwizard/python-base:4.10.1-3.11-docworker
+FROM datastewardshipwizard/python-base:4.12.0-docworker
 
-ENV APPLICATION_CONFIG_PATH /app/config/application.yml
-ENV WORKDIR_PATH /tmp/docworker
-ENV PATH "/home/user/.local/bin:$PATH"
+ENV APPLICATION_CONFIG_PATH=/app/config/application.yml \
+    WORKDIR_PATH=/tmp/docworker \
+    PATH="/home/user/.local/bin:$PATH"
 
 # Add fonts
 COPY packages/dsw-document-worker/resources/fonts /usr/share/fonts/truetype/custom

diff --git a/packages/dsw-document-worker/lambda.Dockerfile b/packages/dsw-document-worker/lambda.Dockerfile
@@ -1,4 +1,4 @@
-FROM datastewardshipwizard/python-base:4.8.1-3.11-docworker-lambda as builder
+FROM datastewardshipwizard/python-base:4.12.0-docworker-lambda AS builder
 
 COPY . /app
 
@@ -11,7 +11,7 @@ RUN python -m pip wheel --wheel-dir=/app/wheels -r /app/packages/dsw-document-wo
  && python -m pip wheel --no-deps --wheel-dir=/app/wheels /app/packages/dsw-document-worker/addons/* \
  && python -m pip wheel --no-deps --wheel-dir=/app/wheels /app/packages/dsw-document-worker
 
-FROM datastewardshipwizard/python-base:4.8.1-3.11-docworker-lambda
+FROM datastewardshipwizard/python-base:4.12.0-docworker-lambda
 
 ARG LAMBDA_TASK_ROOT
 

diff --git a/packages/dsw-mailer/Dockerfile b/packages/dsw-mailer/Dockerfile
@@ -1,4 +1,4 @@
-FROM datastewardshipwizard/python-base:4.10.1-3.11-basic as builder
+FROM datastewardshipwizard/python-base:4.12.0-basic AS builder
 
 WORKDIR /app
 
@@ -10,11 +10,11 @@ RUN python -m pip wheel --no-cache-dir --wheel-dir=/app/wheels -r /app/packages/
  && python -m pip wheel --no-cache-dir --no-deps --wheel-dir=/app/wheels /app/packages/dsw-database \
  && python -m pip wheel --no-cache-dir --no-deps --wheel-dir=/app/wheels /app/packages/dsw-mailer
 
-FROM datastewardshipwizard/python-base:4.10.1-3.11-basic
+FROM datastewardshipwizard/python-base:4.12.0-basic
 
-ENV APPLICATION_CONFIG_PATH /app/config/application.yml
-ENV WORKDIR_PATH /home/user/templates
-ENV PATH "/home/user/.local/bin:$PATH"
+ENV APPLICATION_CONFIG_PATH=/app/config/application.yml \
+    WORKDIR_PATH=/home/user/templates \
+    PATH="/home/user/.local/bin:$PATH"
 
 # Setup non-root user
 USER user

diff --git a/packages/dsw-tdk/Dockerfile b/packages/dsw-tdk/Dockerfile
@@ -1,4 +1,4 @@
-FROM datastewardshipwizard/python-base:4.10.1-3.11-basic as builder
+FROM datastewardshipwizard/python-base:4.12.0-basic AS builder
 
 WORKDIR /app
 
@@ -8,9 +8,9 @@ RUN python -m pip wheel --no-cache-dir --wheel-dir=/app/wheels -r /app/packages/
  && python -m pip wheel --no-cache-dir --no-deps --wheel-dir=/app/wheels /app/packages/dsw-tdk
 
 
-FROM datastewardshipwizard/python-base:4.10.1-3.11-basic
+FROM datastewardshipwizard/python-base:4.12.0-basic
 
-ENV PATH "/home/user/.local/bin:$PATH"
+ENV PATH="/home/user/.local/bin:$PATH"
 
 # Setup non-root user
 USER user