From 62ffe72477870f660f1ea94e83109e37a8a92b02 Mon Sep 17 00:00:00 2001 From: Darien Weems Date: Tue, 26 Aug 2025 15:40:50 -0400 Subject: [PATCH 1/8] add yq to dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8d549429..cc25dc80 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,8 @@ RUN echo "**** install Python 3.12 ****" && \ apt-get install -y \ python3.12 \ python3.12-dev \ - python3.12-venv && \ + python3.12-venv \ + yq && \ update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.12 1 && \ update-alternatives --install /usr/bin/python python /usr/bin/python3.12 1 && \ curl -sS https://bootstrap.pypa.io/get-pip.py | python3.12 && \ From 1655ad0b1566b797916ec53dd33ff0fe45607cd8 Mon Sep 17 00:00:00 2001 From: Darien Weems Date: Tue, 26 Aug 2025 15:51:24 -0400 Subject: [PATCH 2/8] add yq to dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index cc25dc80..3992a42c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,8 +22,8 @@ RUN echo "**** install Python 3.12 ****" && \ apt-get install -y \ python3.12 \ python3.12-dev \ - python3.12-venv \ - yq && \ + python3.12-venv && \ + apt install yq -y && \ update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.12 1 && \ update-alternatives --install /usr/bin/python python /usr/bin/python3.12 1 && \ curl -sS https://bootstrap.pypa.io/get-pip.py | python3.12 && \ From c47a21c1c8525c95caf9d635f13100d6ceebacc4 Mon Sep 17 00:00:00 2001 From: Darien Weems Date: Tue, 26 Aug 2025 16:00:49 -0400 Subject: [PATCH 3/8] apt update --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 3992a42c..57054b9e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,6 +23,7 @@ RUN echo "**** install Python 3.12 ****" && \ python3.12 \ python3.12-dev \ python3.12-venv && \ + apt update && \ apt install yq -y && \ update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.12 1 && \ update-alternatives --install /usr/bin/python python /usr/bin/python3.12 1 && \ From c87fd099926d5cf9f37e2c60f7ccf0e96390e411 Mon Sep 17 00:00:00 2001 From: Darien Weems Date: Tue, 26 Aug 2025 16:09:20 -0400 Subject: [PATCH 4/8] yq install --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 57054b9e..e54b95b1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,8 +23,10 @@ RUN echo "**** install Python 3.12 ****" && \ python3.12 \ python3.12-dev \ python3.12-venv && \ - apt update && \ - apt install yq -y && \ + echo "**** install yq ****" && \ + YQ_VERSION="v4.43.1" && \ + wget -O /usr/local/bin/yq "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64" && \ + chmod +x /usr/local/bin/yq && \ update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.12 1 && \ update-alternatives --install /usr/bin/python python /usr/bin/python3.12 1 && \ curl -sS https://bootstrap.pypa.io/get-pip.py | python3.12 && \ From 60f616a906a29ad46166a4a2ab640c3d9337f4a8 Mon Sep 17 00:00:00 2001 From: Darien Weems Date: Tue, 26 Aug 2025 16:12:05 -0400 Subject: [PATCH 5/8] wget install --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e54b95b1..229f1594 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,8 @@ RUN echo "**** install Python 3.12 ****" && \ apt-get install -y \ python3.12 \ python3.12-dev \ - python3.12-venv && \ + python3.12-venv \ + wget && \ echo "**** install yq ****" && \ YQ_VERSION="v4.43.1" && \ wget -O /usr/local/bin/yq "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64" && \ From 11e43016b08b3d10170acddc5b6f3d8a70b6034e Mon Sep 17 00:00:00 2001 From: Gabe Mendoza Date: Wed, 3 Sep 2025 13:09:00 -0500 Subject: [PATCH 6/8] fix tag --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0bf647e8..31c721f5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ services: - linux/amd64 args: - ECR_ACCOUNT_ID=${ECR_ACCOUNT_ID:-0123456789012} - - BASE_IMAGE_TAG=${BASE_IMAGE_TAG:-latest} + - BASE_IMAGE_TAG=${BASE_IMAGE_TAG:-jammy-latest} - VERSION=${VERSION:-4.102.1} - CODE_RELEASE=${CODE_RELEASE:-4.102.1} environment: From 1d6735b884f20127bbcd16754b1272692d484d12 Mon Sep 17 00:00:00 2001 From: Gabe Mendoza Date: Wed, 3 Sep 2025 13:11:12 -0500 Subject: [PATCH 7/8] undo dockerfile change --- Dockerfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 229f1594..8d549429 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,12 +22,7 @@ RUN echo "**** install Python 3.12 ****" && \ apt-get install -y \ python3.12 \ python3.12-dev \ - python3.12-venv \ - wget && \ - echo "**** install yq ****" && \ - YQ_VERSION="v4.43.1" && \ - wget -O /usr/local/bin/yq "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64" && \ - chmod +x /usr/local/bin/yq && \ + python3.12-venv && \ update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.12 1 && \ update-alternatives --install /usr/bin/python python /usr/bin/python3.12 1 && \ curl -sS https://bootstrap.pypa.io/get-pip.py | python3.12 && \ From 138196948846ea146045ee07b7a0bdac5e0c4dc5 Mon Sep 17 00:00:00 2001 From: Gabe Mendoza Date: Fri, 5 Sep 2025 09:25:02 -0500 Subject: [PATCH 8/8] [CIVIS-11444] just need to rebuild to use latest build image --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 31c721f5..b9460a12 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,8 +14,8 @@ services: - VERSION=${VERSION:-4.102.1} - CODE_RELEASE=${CODE_RELEASE:-4.102.1} environment: - - PUID=${PUID:-0} - - PGID=${PGID:-0} + - PUID=${PUID:-123654} + - PGID=${PGID:-123654} - TZ=${TZ:-America/Chicago} - PROXY_DOMAIN=${PROXY_DOMAIN:-} - DEFAULT_WORKSPACE=${DEFAULT_WORKSPACE:-/workspace}