add PG 16 (#95)

* add PG 16
QPod · Apr 15, 2024 · 4182af1 · 4182af1
1 parent 5250633
commit 4182af1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -364,11 +364,11 @@ jobs:
       - uses: actions/checkout@v4
       - run: |
           source ./tool.sh
-          build_image postgres latest docker_atom/Dockerfile --build-arg "BASE_IMG=postgres:15"
-          build_image postgres latest docker_base/Dockerfile \
-          --build-arg "BASE_IMG=postgres" \
-          --build-arg "PYTHON_VERSION=3.11"
-          push_image postgres
+          build_image postgres-15 latest docker_atom/Dockerfile --build-arg "BASE_IMG=postgres:15"
+          build_image postgres-15 latest docker_base/Dockerfile --build-arg "BASE_IMG=postgres-15" --build-arg "PYTHON_VERSION=3.11"
+          build_image postgres-16 latest docker_atom/Dockerfile --build-arg "BASE_IMG=postgres:16"
+          build_image postgres-16 latest docker_base/Dockerfile --build-arg "BASE_IMG=postgres-16" --build-arg "PYTHON_VERSION=3.11"
+          push_image postgres-
 
   ## DockerKit - including image-syncer and docker-compsoe
   qpod_docker_kit:

diff --git a/docker_base/Dockerfile b/docker_base/Dockerfile
@@ -16,6 +16,8 @@ RUN set -x && source /opt/utils/script-setup.sh \
  && export HAS_SYS_PY3=$( [ -x "$(command -v python3)" ] && echo 'true' || echo 'false' ) && echo "@ Detect OS Py3 installed: $HAS_SYS_PY3" \
  && echo "Install Mamba:" && setup_mamba \
  && echo "Install Python ${PYTHON_VERSION} and conda:" && setup_conda_with_mamba ${PYTHON_VERSION} \
+ && echo "Backup the conda version of platform.py as it's different from the system version." \
+ && cp "${CONDA_PREFIX}/lib/python${PYTHON_VERSION}"/platform.py "${CONDA_PREFIX}/lib/python${PYTHON_VERSION}"/platform.py.bak \
  && $($HAS_SYS_PY3) && ( \
        echo "Replace system Python3 with conda Python - note that /bin and /sbin are symlinks of /usr/bin in docker image ubuntu" \
     && PYTHON_VERSION_DEFAULT=$(py3versions -v -i) \
@@ -27,8 +29,8 @@ RUN set -x && source /opt/utils/script-setup.sh \
  ) || true \
  && ln -sf "${CONDA_PREFIX}"/lib/python${PYTHON_VERSION} /usr/lib/ \
  && ln -sf "${CONDA_PREFIX}"/bin/python3.* /usr/bin/ \
- && ln -sf "${CONDA_PREFIX}"/bin/python${PYTHON_VERSION} /usr/bin/python \
- && ln -sf "${CONDA_PREFIX}"/bin/python${PYTHON_VERSION} /usr/bin/python3 \
+ && ln -sf "/usr/bin/python${PYTHON_VERSION}" /usr/bin/python  \
+ && ln -sf "/usr/bin/python${PYTHON_VERSION}" /usr/bin/python3 \
  && ls -alh /usr/bin/python* \
  && $($HAS_SYS_PY3) && ( py3versions -d ) || true \
  && lsb_release -a \