python

Author: thatguyinabeanie

.env.example

@@ -1,32 +1,5 @@
-# Docker Compose Environment Variables for Ubuntu FIPS Base Image
-# Copy this file to .env and modify values as needed
-
-# Build Arguments
-BUILD_DATE=2025-01-21T00:00:00Z
-VERSION=jammy-22.04
-
-# S6 Overlay Configuration
-S6_OVERLAY_VERSION=3.1.6.2
-S6_OVERLAY_ARCH=x86_64
-MODS_VERSION=v3
-PKG_INST_VERSION=v1
-LSIOWN_VERSION=v1
-
-# Ubuntu Configuration
-REL=jammy
-ARCH=amd64
-
-# User/Group IDs (default abc user is 911:911)
-PUID=911
-PGID=911
-
-# Timezone
-TZ=Etc/UTC
-
-# Volume paths (adjust to your host paths)
-CONFIG_PATH=./config
-APP_PATH=./app
-
-# ECR Configuration (if using ECR for base images)
-# ECR_ACCOUNT_ID=your-aws-account-id
-# ECR_REGION=us-east-1
+# ECR Configuration for FIPS Base Image
+ECR_ACCOUNT_ID=0123456789012
+ECR_REGION=us-east-999
+BASE_IMAGE_NAME=ubuntu-fips
+BASE_IMAGE_TAG=22.04

.gitignore

@@ -42,3 +42,4 @@ Network Trash Folder
 Temporary Items
 .apdisk
 .jenkins-external
+.env

Dockerfile

@@ -1,6 +1,13 @@
 # syntax=docker/dockerfile:1
 
-FROM gabemendoza1/cloudcode-baseimage-ubuntu-fips:jammy-22.04
+# ECR and base image configuration
+ARG ECR_ACCOUNT_ID=1234567890123
+ARG ECR_REGION=us-east-999
+ARG BASE_IMAGE_NAME=ubuntu-fips
+ARG BASE_IMAGE_TAG=22.04
+ARG ECR_URI=${ECR_ACCOUNT_ID}.dkr.ecr-fips.${ECR_REGION}.amazonaws.com/${BASE_IMAGE_NAME}:${BASE_IMAGE_TAG} 
+
+FROM ${ECR_URI} as ubuntu-fips-base
 
 # set version labels
 ARG BUILD_DATE
@@ -14,8 +21,14 @@ ARG S6_OVERLAY_ARCH="x86_64"
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="civisanalytics"
 
-# add s6 overlay
+# install required packages and add s6 overlay
 RUN \
+  echo "**** install required packages ****" && \
+  apt-get update && \
+  apt-get install -y \
+    curl \
+    ca-certificates \
+    xz-utils && \
   echo "**** add s6 overlay ****" && \
   curl -o /tmp/s6-overlay-noarch.tar.xz -L \
     "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz" && \
@@ -82,3 +95,24 @@ RUN \
 COPY root/ /
 
 ENTRYPOINT ["/init"]
+
+FROM ubuntu-fips-base as ubuntu-fips-base-python
+
+# Install Python 3.10 and development tools
+RUN apt-get update && apt-get install -y \
+  python3.10 \
+  python3.10-dev \
+  python3.10-venv \
+  python3-pip \
+  build-essential \
+  libpq-dev \
+  git \
+  ca-certificates \
+  openssl \
+  libssl-dev && \
+  rm -rf /var/lib/apt/lists/* && \
+  # Update CA certificates to ensure SSL/TLS works properly
+  update-ca-certificates && \
+  ln -sf /usr/bin/python3.10 /usr/bin/python && \
+  ln -sf /usr/bin/python3.10 /usr/bin/python3 
+

docker-compose.yml

@@ -1,9 +1,13 @@
 ---
 services:
   ubuntu-fips:
+    image: gabemendoza1/cloudcode-baseimage-ubuntu-fips:${VERSION:-jammy-22.04}
     build:
       context: .
       dockerfile: Dockerfile
+      target: ubuntu-fips-base-python
+      platforms:
+        - linux/amd64
       args:
         - VERSION=${VERSION:-jammy-22.04}
         - S6_OVERLAY_VERSION=${S6_OVERLAY_VERSION:-3.1.6.2}
@@ -13,4 +17,8 @@ services:
         - LSIOWN_VERSION=${LSIOWN_VERSION:-v1}
         - REL=${REL:-jammy}
         - ARCH=${ARCH:-amd64}
-    image: gabemendoza1/cloudcode-baseimage-ubuntu-fips:${VERSION:-jammy-22.04}
+        - ECR_ACCOUNT_ID=${ECR_ACCOUNT_ID}
+        - ECR_REGION=${ECR_REGION:-us-east-1}
+        - BASE_IMAGE_NAME=${BASE_IMAGE_NAME}
+        - BASE_IMAGE_TAG=${BASE_IMAGE_TAG:-22.04}
+