Skip to content

Commit 30eef6c

Browse files
authored
Merge pull request #751 from Steinbeck-Lab/development
fix: CMS_INTERNAL_AUTH_TOKEN interpolation and bake RELEASE_VERSION
2 parents 33c7963 + 4c7356d commit 30eef6c

3 files changed

Lines changed: 7 additions & 2 deletions

File tree

‎Dockerfile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ RUN apt-get update && \
3232

3333
ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk/
3434

35+
ARG RELEASE_VERSION=1.0
36+
ENV RELEASE_VERSION=${RELEASE_VERSION}
37+
3538
# Combine conda and pip operations to reduce layers
3639
WORKDIR /code
3740
COPY requirements.txt .

‎Dockerfile.lite‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ RUN apt-get update && \
3838

3939
ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk/
4040

41+
ARG RELEASE_VERSION=1.0
42+
ENV RELEASE_VERSION=${RELEASE_VERSION}
43+
4144
WORKDIR /code
4245
COPY requirements_lite.txt .
4346

‎ops/docker-compose-prod.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ services:
2424
- ../.env
2525
environment:
2626
HOMEPAGE_URL: "/latest/docs" # App serves docs at /latest/docs
27-
RELEASE_VERSION: v2.6.0 # Or dynamically set from release tag
28-
CMS_INTERNAL_AUTH_TOKEN: ${CMS_INTERNAL_AUTH_TOKEN}
27+
# RELEASE_VERSION is baked into the Docker image at build time via ARG
2928
# pull_policy: always # Use if pulling pre-built images
3029
labels:
3130
- "traefik.enable=true"

0 commit comments

Comments
 (0)