From 9cafa2c8d8dd767c31b44b46bc56d6c3097e1366 Mon Sep 17 00:00:00 2001 From: Eric Nost Date: Tue, 10 Nov 2026 19:12:52 -0500 Subject: [PATCH 1/3] Update Dockerfile set to default to v4.2024.0 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4d0c3fa..c93c915 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,12 +49,12 @@ RUN echo '#!/bin/bash\nexec /usr/bin/google-chrome-stable --no-sandbox --disable # Override at build time without editing this file, e.g.: # docker build --build-arg EJAM_VERSION=v3.2022.2 . # docker build --build-arg EJAM_VERSION=v3.2023.0 . -# docker build --build-arg EJAM_VERSION=v3.2024.0 . +# docker build --build-arg EJAM_VERSION=v4.2024.0 . # A branch name also works (no leading "v"), e.g. EJAM_VERSION=development -- but a branch # moves while the "git clone" RUN layer below is cached, so a plain rebuild may reuse an old # clone of that branch; force a fresh pull of the current tip with "docker build --no-cache". # A CI build can supply it from a repo variable (see README "Choosing the EJAM version"). -ARG EJAM_VERSION=v3.2022.2 +ARG EJAM_VERSION=v4.2024.0 # Record the version in the image so the running API can report which EJAM it was built with. ENV EJAM_VERSION=${EJAM_VERSION} From ecca86ead4a367cc832000f66e6f9f9ff5a36b19 Mon Sep 17 00:00:00 2001 From: Eric Nost Date: Tue, 10 Nov 2026 19:31:14 -0500 Subject: [PATCH 2/3] Update cloudbuild.yaml v4.2024.0 --- cloudbuild.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index dc4f403..3cc0b1e 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -1,8 +1,8 @@ steps: - name: 'gcr.io/cloud-builders/docker' - args: ['build', '-t', 'gcr.io/canada-edj/ejamapi:v3.2022.3', '.'] + args: ['build', '-t', 'gcr.io/canada-edj/ejamapi:v4.2024.0', '.'] env: - 'DOCKER_BUILDKIT=1' images: - - 'gcr.io/canada-edj/ejamapi:v3.2022.3' \ No newline at end of file + - 'gcr.io/canada-edj/ejamapi:v4.2024.0' \ No newline at end of file From 60ae67eee7f84ca096a3513130a4cfc038db4b95 Mon Sep 17 00:00:00 2001 From: ejanalysis Date: Tue, 10 Nov 2026 23:01:05 -0500 Subject: [PATCH 3/3] Set the API's time zone to Los Angeles for report dates Cloud Run runs on UTC, so the "Report created on" date in API-built reports showed tomorrow's date after 7 pm Eastern. America/Los_Angeles matches the EJAM app's fallback time zone. Also installs tzdata so R can use the setting. Co-Authored-By: Claude Opus 5.5 --- Dockerfile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 62592ac..6706fe8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,10 +6,17 @@ FROM --platform=linux/amd64 ubuntu:22.04 # Set DEBIAN_FRONTEND to noninteractive to avoid prompts during installation ENV DEBIAN_FRONTEND=noninteractive +# Time zone for dates the API prints, e.g. "Report created on " in report +# footers. Cloud Run runs on UTC, so without this a report made after 7 pm +# Eastern shows tomorrow's date. Los Angeles matches the EJAM app's fallback +# (it uses the user's browser time zone, else America/Los_Angeles), so every +# mainland US user sees today's date until midnight in Los Angeles. +ENV TZ=America/Los_Angeles + # Install System Dependencies, Pandoc, Git LFS, and Google Chrome RUN apt-get update && \ apt-get install -y --no-install-recommends \ - software-properties-common wget unzip gnupg ca-certificates locales \ + software-properties-common wget unzip gnupg ca-certificates locales tzdata \ pandoc git git-lfs \ libudunits2-dev libmysqlclient-dev libcurl4-openssl-dev libsodium-dev \ libgdal-dev libgeos-dev libproj-dev libssl-dev libxml2-dev zlib1g-dev \