diff --git a/.github/workflows/epicmorg.base.images.debian.11.yml b/.github/workflows/epicmorg.base.images.debian.11.yml index 456e83546..d31274088 100644 --- a/.github/workflows/epicmorg.base.images.debian.11.yml +++ b/.github/workflows/epicmorg.base.images.debian.11.yml @@ -38,6 +38,29 @@ jobs: ################################################################################## + - name: "Build and Deploy Debian 11 LTS Python 3.9:" + run: cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.9 && pwd && make build && make deploy + + - name: "Build and Deploy Debian 11 LTS Python 3.10:" + run: cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.10 && pwd && make build && make deploy + + - name: "Build and Deploy Debian 11 LTS Python 3.11:" + run: cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.11 && pwd && make build && make deploy + + - name: "Build and Deploy Debian 11 LTS Python 3.12:" + run: cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.12 && pwd && make build && make deploy + + - name: "Build and Deploy Debian 11 LTS Python 3.12:" + run: cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.13 && pwd && make build && make deploy + +################################################################################## + + - name: Cleanup + run: make docker-clean + +################################################################################## + + - name: "Build and Deploy Debian 11 LTS jdk6 Image:" run: cd linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk6 && pwd && make build && make deploy diff --git a/.github/workflows/epicmorg.base.images.debian.12.yml b/.github/workflows/epicmorg.base.images.debian.12.yml index 8c71075e8..1f85b2cfe 100644 --- a/.github/workflows/epicmorg.base.images.debian.12.yml +++ b/.github/workflows/epicmorg.base.images.debian.12.yml @@ -38,8 +38,20 @@ jobs: ################################################################################## - - name: "Build and Deploy Debian 12 Python 2.6 Image:" - run: cd linux/ecosystem/epicmorg/debian/12-bookworm/php/php5.6 && pwd && make build && make deploy + - name: "Build and Deploy Debian 12 Python 3.9:" + run: cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.9 && pwd && make build && make deploy + + - name: "Build and Deploy Debian 12 Python 3.10:" + run: cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.10 && pwd && make build && make deploy + + - name: "Build and Deploy Debian 12 Python 3.11:" + run: cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.11 && pwd && make build && make deploy + + - name: "Build and Deploy Debian 12 Python 3.12:" + run: cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.12 && pwd && make build && make deploy + + - name: "Build and Deploy Debian 12 Python 3.12:" + run: cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.13 && pwd && make build && make deploy ################################################################################## diff --git a/.github/workflows/epicmorg.base.images.debian.13.yml b/.github/workflows/epicmorg.base.images.debian.13.yml index 671fa22dd..8d5d08f91 100644 --- a/.github/workflows/epicmorg.base.images.debian.13.yml +++ b/.github/workflows/epicmorg.base.images.debian.13.yml @@ -36,6 +36,28 @@ jobs: - name: Cleanup run: make docker-clean +################################################################################## + + - name: "Build and Deploy Debian 13 Python 3.9:" + run: cd `pwd`/linux/ecosystem/epicmorg/debian/13-trixie/python/3.9 && pwd && make build && make deploy + + - name: "Build and Deploy Debian 13 Python 3.10:" + run: cd `pwd`/linux/ecosystem/epicmorg/debian/13-trixie/python/3.10 && pwd && make build && make deploy + + - name: "Build and Deploy Debian 13 Python 3.11:" + run: cd `pwd`/linux/ecosystem/epicmorg/debian/13-trixie/python/3.11 && pwd && make build && make deploy + + - name: "Build and Deploy Debian 13 Python 3.12:" + run: cd `pwd`/linux/ecosystem/epicmorg/debian/13-trixie/python/3.12 && pwd && make build && make deploy + + - name: "Build and Deploy Debian 13 Python 3.12:" + run: cd `pwd`/linux/ecosystem/epicmorg/debian/13-trixie/python/3.13 && pwd && make build && make deploy + +################################################################################## + + - name: Cleanup + run: make docker-clean + ################################################################################## - name: "Build and Deploy Debian 13 jdk6 Image:" diff --git a/.github/workflows/epicmorg.base.images.debian.sid.yml b/.github/workflows/epicmorg.base.images.debian.sid.yml index d8dc7270e..14dda6b2c 100644 --- a/.github/workflows/epicmorg.base.images.debian.sid.yml +++ b/.github/workflows/epicmorg.base.images.debian.sid.yml @@ -36,6 +36,28 @@ jobs: - name: Cleanup run: make docker-clean +################################################################################## + + - name: "Build and Deploy Debian SID Python 3.9:" + run: cd `pwd`/linux/ecosystem/epicmorg/debian/sid/python/3.9 && pwd && make build && make deploy + + - name: "Build and Deploy Debian SID Python 3.10:" + run: cd `pwd`/linux/ecosystem/epicmorg/debian/sid/python/3.10 && pwd && make build && make deploy + + - name: "Build and Deploy Debian SID Python 3.11:" + run: cd `pwd`/linux/ecosystem/epicmorg/debian/sid/python/3.11 && pwd && make build && make deploy + + - name: "Build and Deploy Debian SID Python 3.12:" + run: cd `pwd`/linux/ecosystem/epicmorg/debian/sid/python/3.12 && pwd && make build && make deploy + + - name: "Build and Deploy Debian SID Python 3.12:" + run: cd `pwd`/linux/ecosystem/epicmorg/debian/sid/python/3.13 && pwd && make build && make deploy + +################################################################################## + + - name: Cleanup + run: make docker-clean + ################################################################################## - name: "Build and Deploy Debian SID jdk6 Image:" diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d965b350..0dab2cd02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ * updated `OpenSSL` versions. * created `python` base images. * updated `nextcloud` images. + * fixed `sid` and `trixie` images. * `jan` * updated `atlassian` images * updated some deps in images: diff --git a/Makefile b/Makefile index d01fe0dd0..e76b2d157 100644 --- a/Makefile +++ b/Makefile @@ -740,10 +740,6 @@ ecosystem-debian-trixie-base-images: cd `pwd`/linux/ecosystem/epicmorg/debian/13-trixie/develop && pwd && make build && make deploy ecosystem-debian-trixie-python-images: - cd `pwd`/linux/ecosystem/epicmorg/debian/13-trixie/python/2.6 && pwd && make build && make deploy - cd `pwd`/linux/ecosystem/epicmorg/debian/13-trixie/python/2.7 && pwd && make build && make deploy -# cd `pwd`/linux/ecosystem/epicmorg/debian/13-trixie/python/3.0 && pwd && make build && make deploy - cd `pwd`/linux/ecosystem/epicmorg/debian/13-trixie/python/3.1 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/epicmorg/debian/13-trixie/python/3.2 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/epicmorg/debian/13-trixie/python/3.3 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/epicmorg/debian/13-trixie/python/3.4 && pwd && make build && make deploy @@ -819,10 +815,6 @@ ecosystem-debian-sid-base-images: cd `pwd`/linux/ecosystem/epicmorg/debian/sid/develop && pwd && make build && make deploy ecosystem-debian-sid-python-images: - cd `pwd`/linux/ecosystem/epicmorg/debian/sid/python/2.6 && pwd && make build && make deploy - cd `pwd`/linux/ecosystem/epicmorg/debian/sid/python/2.7 && pwd && make build && make deploy -# cd `pwd`/linux/ecosystem/epicmorg/debian/sid/python/3.0 && pwd && make build && make deploy - cd `pwd`/linux/ecosystem/epicmorg/debian/sid/python/3.1 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/epicmorg/debian/sid/python/3.2 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/epicmorg/debian/sid/python/3.3 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/epicmorg/debian/sid/python/3.4 && pwd && make build && make deploy @@ -2484,8 +2476,8 @@ bundle-python: @echo "==============================================" @echo "===== Building EpicMorg Python images =====" @echo "==============================================" - make ecosystem-debian-bullseye-python-images - make ecosystem-debian-bookworm-python-images +# make ecosystem-debian-bullseye-python-images +# make ecosystem-debian-bookworm-python-images make ecosystem-debian-trixie-python-images make ecosystem-debian-sid-python-images diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.12/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.12/Dockerfile index 4d3a646d9..bd4814faa 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.12/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.12/Dockerfile @@ -51,7 +51,7 @@ RUN ./configure \ --enable-loadable-sqlite-extensions \ --with-ensurepip=install \ --enable-profiling \ - --with-system-expat \ + # --with-system-expat \ --with-computed-gotos \ --with-pydebug \ --with-trace-refs \ diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.13/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.13/Dockerfile index 8d84b6bca..52c8c0dc1 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.13/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.13/Dockerfile @@ -51,7 +51,7 @@ RUN ./configure \ --enable-loadable-sqlite-extensions \ --with-ensurepip=install \ --enable-profiling \ - --with-system-expat \ + # --with-system-expat \ --with-computed-gotos \ --with-pydebug \ --with-trace-refs \ diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/python/README.md b/linux/ecosystem/epicmorg/debian/11-bullseye/python/README.md index c2cdf75a4..2df2ca322 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/python/README.md +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/python/README.md @@ -1,20 +1,26 @@ # Version Compablity -| Python | OpenSSL | Comments | -| ------------- | ------------- | ----------------- | -| 2.6 | Not ready | No pip installed | -| 2.7 | Not ready | | -| 3.0 | 1.0.2u | No pip installed | -| 3.1 | 1.0.2u | No pip installed | -| 3.2 | 1.0.2u | | -| 3.3 | 1.0.2u | | -| 3.4 | 1.0.2u | | -| 3.5 | 1.1.1.1w | | -| 3.6 | 1.1.1.1w | | -| 3.7 | 1.1.1.1w | | -| 3.8 | 1.1.1.1w | | -| 3.9 | 1.1.1.1w | | -| 3.10 | 3.4.x | | -| 3.11 | 3.4.x | | -| 3.12 | 3.4.x | | -| 3.13 | 3.4.x | | +## Status of Python versions + +https://devguide.python.org/versions/ + +| Python | OpenSSL | Comments | Status | +| ------------- | ------------- | ----------------- | --------- | +| 2.6 | Not ready | No pip installed | End Of Life | +| 2.7 | Not ready | | End Of Life | +| 3.0 | Not ready | No pip installed | End Of Life | +| 3.1 | Not ready | No pip installed | End Of Life | +| 3.2 | 1.0.2u | | End Of Life | +| 3.3 | 1.0.2u | | End Of Life | +| 3.4 | 1.0.2u | | End Of Life | +| 3.5 | 1.1.1.1w | | End Of Life | +| 3.6 | 1.1.1.1w | | End Of Life | +| 3.7 | 1.1.1.1w | | End Of Life | +| 3.8 | 1.1.1.1w | | End Of Life | +| 3.9 | 1.1.1.1w | | security, 2025-10 | +| 3.10 | 3.4.x | | security, 2026-10 | +| 3.11 | 3.4.x | | security, 2029-10 | +| 3.12 | 3.4.x | | bugfix, 2028-10 | +| 3.13 | 3.4.x | | bugfix, 2029-10 | + +Only supported versions will be automaticly updated at CI. diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.12/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.12/Dockerfile index 46e5dea1b..b6a6ef285 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.12/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.12/Dockerfile @@ -51,7 +51,7 @@ RUN ./configure \ --enable-loadable-sqlite-extensions \ --with-ensurepip=install \ --enable-profiling \ - --with-system-expat \ + # --with-system-expat \ --with-computed-gotos \ --with-pydebug \ --with-trace-refs \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.13/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.13/Dockerfile index ba092c42e..d53566fa5 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.13/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.13/Dockerfile @@ -51,7 +51,7 @@ RUN ./configure \ --enable-loadable-sqlite-extensions \ --with-ensurepip=install \ --enable-profiling \ - --with-system-expat \ + # --with-system-expat \ --with-computed-gotos \ --with-pydebug \ --with-trace-refs \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/python/README.md b/linux/ecosystem/epicmorg/debian/12-bookworm/python/README.md index c2cdf75a4..2df2ca322 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/python/README.md +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/python/README.md @@ -1,20 +1,26 @@ # Version Compablity -| Python | OpenSSL | Comments | -| ------------- | ------------- | ----------------- | -| 2.6 | Not ready | No pip installed | -| 2.7 | Not ready | | -| 3.0 | 1.0.2u | No pip installed | -| 3.1 | 1.0.2u | No pip installed | -| 3.2 | 1.0.2u | | -| 3.3 | 1.0.2u | | -| 3.4 | 1.0.2u | | -| 3.5 | 1.1.1.1w | | -| 3.6 | 1.1.1.1w | | -| 3.7 | 1.1.1.1w | | -| 3.8 | 1.1.1.1w | | -| 3.9 | 1.1.1.1w | | -| 3.10 | 3.4.x | | -| 3.11 | 3.4.x | | -| 3.12 | 3.4.x | | -| 3.13 | 3.4.x | | +## Status of Python versions + +https://devguide.python.org/versions/ + +| Python | OpenSSL | Comments | Status | +| ------------- | ------------- | ----------------- | --------- | +| 2.6 | Not ready | No pip installed | End Of Life | +| 2.7 | Not ready | | End Of Life | +| 3.0 | Not ready | No pip installed | End Of Life | +| 3.1 | Not ready | No pip installed | End Of Life | +| 3.2 | 1.0.2u | | End Of Life | +| 3.3 | 1.0.2u | | End Of Life | +| 3.4 | 1.0.2u | | End Of Life | +| 3.5 | 1.1.1.1w | | End Of Life | +| 3.6 | 1.1.1.1w | | End Of Life | +| 3.7 | 1.1.1.1w | | End Of Life | +| 3.8 | 1.1.1.1w | | End Of Life | +| 3.9 | 1.1.1.1w | | security, 2025-10 | +| 3.10 | 3.4.x | | security, 2026-10 | +| 3.11 | 3.4.x | | security, 2029-10 | +| 3.12 | 3.4.x | | bugfix, 2028-10 | +| 3.13 | 3.4.x | | bugfix, 2029-10 | + +Only supported versions will be automaticly updated at CI. diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/dotnet8/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/dotnet8/Dockerfile index 850e03fd7..544a8a3e1 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/dotnet8/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/dotnet8/Dockerfile @@ -1,3 +1,6 @@ +FROM epicmorg/debian:trixie-develop as builder +RUN echo "Just temp lyer to copy OpenSSL" + FROM epicmorg/debian:trixie LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive @@ -11,6 +14,22 @@ ARG DOTNET_INSTALL_SCRIPT_URL=https://dotnet.microsoft.com/download/dotnet/scrip ENV DOTNET_CLI_TELEMETRY_OPTOUT=true ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true +################################################################## +# OpenSSL 3.4 +################################################################## +ENV OPENSSL_34_VERSION=3.4.1 +ENV OPENSSL_34_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_34_VERSION} +ENV OPENSSL_34_BIN_DIR=${OPENSSL_34_DIR}/bin +ENV OPENSSL_34_INC_DIR=${OPENSSL_34_DIR}/include +ENV OPENSSL_34_LIB_DIR=${OPENSSL_34_DIR}/lib64 +ENV OPENSSL_34_SRC_DIR=/usr/local/src/openssl/${OPENSSL_34_VERSION} + +COPY --from=builder ${OPENSSL_34_DIR} ${OPENSSL_34_DIR} +COPY --from=builder ${OPENSSL_34_SRC_DIR} ${OPENSSL_34_SRC_DIR} + +ENV OPENSSL_ROOT=${OPENSSL_34_DIR} +ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH + ################################################################## # installing dotnet ################################################################## @@ -22,7 +41,7 @@ RUN mkdir -p ${DOTNET_ROOT} && \ ################################################################## # Setup $PATH ################################################################## -ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR} +ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR}:${OPENSSL_34_BIN_DIR} ################################################################## # Version after install diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/dotnet8/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/dotnet8/Dockerfile.develop index f47f019f7..a0044e854 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/dotnet8/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/dotnet8/Dockerfile.develop @@ -11,6 +11,9 @@ ARG DOTNET_INSTALL_SCRIPT_URL=https://dotnet.microsoft.com/download/dotnet/scrip ENV DOTNET_CLI_TELEMETRY_OPTOUT=true ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true +ENV OPENSSL_ROOT=${OPENSSL_34_DIR} +ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH + ################################################################## # installing dotnet ################################################################## @@ -22,7 +25,7 @@ RUN mkdir -p ${DOTNET_ROOT} && \ ################################################################## # Setup $PATH ################################################################## -ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR} +ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR}:${OPENSSL_34_BIN_DIR} ################################################################## # Setup certs diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/dotnet9/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/dotnet9/Dockerfile index 03a9391fd..044c95b40 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/dotnet9/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/dotnet9/Dockerfile @@ -1,3 +1,6 @@ +FROM epicmorg/debian:trixie-develop as builder +RUN echo "Just temp lyer to copy OpenSSL" + FROM epicmorg/debian:trixie LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive @@ -11,6 +14,23 @@ ARG DOTNET_INSTALL_SCRIPT_URL=https://dotnet.microsoft.com/download/dotnet/scrip ENV DOTNET_CLI_TELEMETRY_OPTOUT=true ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true +################################################################## +# OpenSSL 3.4 +################################################################## +ENV OPENSSL_34_VERSION=3.4.1 +ENV OPENSSL_34_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_34_VERSION} +ENV OPENSSL_34_BIN_DIR=${OPENSSL_34_DIR}/bin +ENV OPENSSL_34_INC_DIR=${OPENSSL_34_DIR}/include +ENV OPENSSL_34_LIB_DIR=${OPENSSL_34_DIR}/lib64 +ENV OPENSSL_34_SRC_DIR=/usr/local/src/openssl/${OPENSSL_34_VERSION} + +COPY --from=builder ${PYTHON_DIR} ${PYTHON_DIR} +COPY --from=builder ${OPENSSL_34_DIR} ${OPENSSL_34_DIR} +COPY --from=builder ${OPENSSL_34_SRC_DIR} ${OPENSSL_34_SRC_DIR} + +ENV OPENSSL_ROOT=${OPENSSL_34_DIR} +ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH + ################################################################## # installing dotnet ################################################################## @@ -22,7 +42,7 @@ RUN mkdir -p ${DOTNET_ROOT} && \ ################################################################## # Setup $PATH ################################################################## -ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR} +ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR}:${OPENSSL_34_BIN_DIR} ################################################################## # Version after install diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/dotnet9/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/dotnet9/Dockerfile.develop index 664306d48..7cd84612e 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/dotnet9/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/dotnet9/Dockerfile.develop @@ -11,6 +11,9 @@ ARG DOTNET_INSTALL_SCRIPT_URL=https://dotnet.microsoft.com/download/dotnet/scrip ENV DOTNET_CLI_TELEMETRY_OPTOUT=true ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true +ENV OPENSSL_ROOT=${OPENSSL_34_DIR} +ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH + ################################################################## # installing dotnet ################################################################## @@ -22,7 +25,7 @@ RUN mkdir -p ${DOTNET_ROOT} && \ ################################################################## # Setup $PATH ################################################################## -ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR} +ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR}:${OPENSSL_34_BIN_DIR} ################################################################## # Setup certs diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/lts/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/lts/Dockerfile index 18f084cf4..9221c65c2 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/lts/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/lts/Dockerfile @@ -1,3 +1,6 @@ +FROM epicmorg/debian:trixie-develop as builder +RUN echo "Just temp lyer to copy OpenSSL" + FROM epicmorg/debian:trixie LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive @@ -11,6 +14,22 @@ ARG DOTNET_INSTALL_SCRIPT_URL=https://dotnet.microsoft.com/download/dotnet/scrip ENV DOTNET_CLI_TELEMETRY_OPTOUT=true ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true +################################################################## +# OpenSSL 3.4 +################################################################## +ENV OPENSSL_34_VERSION=3.4.1 +ENV OPENSSL_34_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_34_VERSION} +ENV OPENSSL_34_BIN_DIR=${OPENSSL_34_DIR}/bin +ENV OPENSSL_34_INC_DIR=${OPENSSL_34_DIR}/include +ENV OPENSSL_34_LIB_DIR=${OPENSSL_34_DIR}/lib64 +ENV OPENSSL_34_SRC_DIR=/usr/local/src/openssl/${OPENSSL_34_VERSION} + +COPY --from=builder ${OPENSSL_34_DIR} ${OPENSSL_34_DIR} +COPY --from=builder ${OPENSSL_34_SRC_DIR} ${OPENSSL_34_SRC_DIR} + +ENV OPENSSL_ROOT=${OPENSSL_34_DIR} +ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH + ################################################################## # installing dotnet ################################################################## @@ -22,7 +41,7 @@ RUN mkdir -p ${DOTNET_ROOT} && \ ################################################################## # Setup $PATH ################################################################## -ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR} +ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR}:${OPENSSL_34_BIN_DIR} ################################################################## # Version after install diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/lts/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/lts/Dockerfile.develop index 2e0f9a58e..faa9fa814 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/lts/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/lts/Dockerfile.develop @@ -11,6 +11,9 @@ ARG DOTNET_INSTALL_SCRIPT_URL=https://dotnet.microsoft.com/download/dotnet/scrip ENV DOTNET_CLI_TELEMETRY_OPTOUT=true ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true +ENV OPENSSL_ROOT=${OPENSSL_34_DIR} +ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH + ################################################################## # installing dotnet ################################################################## @@ -22,7 +25,7 @@ RUN mkdir -p ${DOTNET_ROOT} && \ ################################################################## # Setup $PATH ################################################################## -ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR} +ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR}:${OPENSSL_34_BIN_DIR} ################################################################## # Setup certs diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/sts/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/sts/Dockerfile index 60b6af466..07f8275db 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/sts/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/sts/Dockerfile @@ -1,3 +1,6 @@ +FROM epicmorg/debian:trixie-develop as builder +RUN echo "Just temp lyer to copy OpenSSL" + FROM epicmorg/debian:trixie LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive @@ -11,6 +14,22 @@ ARG DOTNET_INSTALL_SCRIPT_URL=https://dotnet.microsoft.com/download/dotnet/scrip ENV DOTNET_CLI_TELEMETRY_OPTOUT=true ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true +################################################################## +# OpenSSL 3.4 +################################################################## +ENV OPENSSL_34_VERSION=3.4.1 +ENV OPENSSL_34_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_34_VERSION} +ENV OPENSSL_34_BIN_DIR=${OPENSSL_34_DIR}/bin +ENV OPENSSL_34_INC_DIR=${OPENSSL_34_DIR}/include +ENV OPENSSL_34_LIB_DIR=${OPENSSL_34_DIR}/lib64 +ENV OPENSSL_34_SRC_DIR=/usr/local/src/openssl/${OPENSSL_34_VERSION} + +COPY --from=builder ${OPENSSL_34_DIR} ${OPENSSL_34_DIR} +COPY --from=builder ${OPENSSL_34_SRC_DIR} ${OPENSSL_34_SRC_DIR} + +ENV OPENSSL_ROOT=${OPENSSL_34_DIR} +ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH + ################################################################## # installing dotnet ################################################################## @@ -22,7 +41,7 @@ RUN mkdir -p ${DOTNET_ROOT} && \ ################################################################## # Setup $PATH ################################################################## -ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR} +ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR}:${OPENSSL_34_BIN_DIR} ################################################################## # Version after install diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/sts/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/sts/Dockerfile.develop index 7a207ad2c..5fb55653e 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/sts/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/13-trixie/dotnet/sts/Dockerfile.develop @@ -11,6 +11,9 @@ ARG DOTNET_INSTALL_SCRIPT_URL=https://dotnet.microsoft.com/download/dotnet/scrip ENV DOTNET_CLI_TELEMETRY_OPTOUT=true ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true +ENV OPENSSL_ROOT=${OPENSSL_34_DIR} +ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH + ################################################################## # installing dotnet ################################################################## @@ -22,7 +25,7 @@ RUN mkdir -p ${DOTNET_ROOT} && \ ################################################################## # Setup $PATH ################################################################## -ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR} +ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR}:${OPENSSL_34_BIN_DIR} ################################################################## # Setup certs diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.12/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.12/Dockerfile index 8fca7f348..68dcc7177 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.12/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.12/Dockerfile @@ -51,7 +51,7 @@ RUN ./configure \ --enable-loadable-sqlite-extensions \ --with-ensurepip=install \ --enable-profiling \ - --with-system-expat \ + # --with-system-expat \ --with-computed-gotos \ --with-pydebug \ --with-trace-refs \ diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.13/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.13/Dockerfile index 498667206..c0f9371fc 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/python/3.13/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/python/3.13/Dockerfile @@ -51,7 +51,7 @@ RUN ./configure \ --enable-loadable-sqlite-extensions \ --with-ensurepip=install \ --enable-profiling \ - --with-system-expat \ + # --with-system-expat \ --with-computed-gotos \ --with-pydebug \ --with-trace-refs \ diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/python/README.md b/linux/ecosystem/epicmorg/debian/13-trixie/python/README.md index c2cdf75a4..2df2ca322 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/python/README.md +++ b/linux/ecosystem/epicmorg/debian/13-trixie/python/README.md @@ -1,20 +1,26 @@ # Version Compablity -| Python | OpenSSL | Comments | -| ------------- | ------------- | ----------------- | -| 2.6 | Not ready | No pip installed | -| 2.7 | Not ready | | -| 3.0 | 1.0.2u | No pip installed | -| 3.1 | 1.0.2u | No pip installed | -| 3.2 | 1.0.2u | | -| 3.3 | 1.0.2u | | -| 3.4 | 1.0.2u | | -| 3.5 | 1.1.1.1w | | -| 3.6 | 1.1.1.1w | | -| 3.7 | 1.1.1.1w | | -| 3.8 | 1.1.1.1w | | -| 3.9 | 1.1.1.1w | | -| 3.10 | 3.4.x | | -| 3.11 | 3.4.x | | -| 3.12 | 3.4.x | | -| 3.13 | 3.4.x | | +## Status of Python versions + +https://devguide.python.org/versions/ + +| Python | OpenSSL | Comments | Status | +| ------------- | ------------- | ----------------- | --------- | +| 2.6 | Not ready | No pip installed | End Of Life | +| 2.7 | Not ready | | End Of Life | +| 3.0 | Not ready | No pip installed | End Of Life | +| 3.1 | Not ready | No pip installed | End Of Life | +| 3.2 | 1.0.2u | | End Of Life | +| 3.3 | 1.0.2u | | End Of Life | +| 3.4 | 1.0.2u | | End Of Life | +| 3.5 | 1.1.1.1w | | End Of Life | +| 3.6 | 1.1.1.1w | | End Of Life | +| 3.7 | 1.1.1.1w | | End Of Life | +| 3.8 | 1.1.1.1w | | End Of Life | +| 3.9 | 1.1.1.1w | | security, 2025-10 | +| 3.10 | 3.4.x | | security, 2026-10 | +| 3.11 | 3.4.x | | security, 2029-10 | +| 3.12 | 3.4.x | | bugfix, 2028-10 | +| 3.13 | 3.4.x | | bugfix, 2029-10 | + +Only supported versions will be automaticly updated at CI. diff --git a/linux/ecosystem/epicmorg/debian/sid/dotnet/dotnet8/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/dotnet/dotnet8/Dockerfile index 407264c23..78eb5af01 100644 --- a/linux/ecosystem/epicmorg/debian/sid/dotnet/dotnet8/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/dotnet/dotnet8/Dockerfile @@ -1,3 +1,6 @@ +FROM epicmorg/debian:sid-develop as builder +RUN echo "Just temp lyer to copy OpenSSL" + FROM epicmorg/debian:sid LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive @@ -11,6 +14,22 @@ ARG DOTNET_INSTALL_SCRIPT_URL=https://dotnet.microsoft.com/download/dotnet/scrip ENV DOTNET_CLI_TELEMETRY_OPTOUT=true ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true +################################################################## +# OpenSSL 3.4 +################################################################## +ENV OPENSSL_34_VERSION=3.4.1 +ENV OPENSSL_34_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_34_VERSION} +ENV OPENSSL_34_BIN_DIR=${OPENSSL_34_DIR}/bin +ENV OPENSSL_34_INC_DIR=${OPENSSL_34_DIR}/include +ENV OPENSSL_34_LIB_DIR=${OPENSSL_34_DIR}/lib64 +ENV OPENSSL_34_SRC_DIR=/usr/local/src/openssl/${OPENSSL_34_VERSION} + +COPY --from=builder ${OPENSSL_34_DIR} ${OPENSSL_34_DIR} +COPY --from=builder ${OPENSSL_34_SRC_DIR} ${OPENSSL_34_SRC_DIR} + +ENV OPENSSL_ROOT=${OPENSSL_34_DIR} +ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH + ################################################################## # installing dotnet ################################################################## @@ -22,7 +41,7 @@ RUN mkdir -p ${DOTNET_ROOT} && \ ################################################################## # Setup $PATH ################################################################## -ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR} +ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR}:${OPENSSL_34_BIN_DIR} ################################################################## # Version after install diff --git a/linux/ecosystem/epicmorg/debian/sid/dotnet/dotnet8/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/sid/dotnet/dotnet8/Dockerfile.develop index ebeba3850..fe9e891f6 100644 --- a/linux/ecosystem/epicmorg/debian/sid/dotnet/dotnet8/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/sid/dotnet/dotnet8/Dockerfile.develop @@ -11,6 +11,9 @@ ARG DOTNET_INSTALL_SCRIPT_URL=https://dotnet.microsoft.com/download/dotnet/scrip ENV DOTNET_CLI_TELEMETRY_OPTOUT=true ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true +ENV OPENSSL_ROOT=${OPENSSL_34_DIR} +ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH + ################################################################## # installing dotnet ################################################################## @@ -22,7 +25,7 @@ RUN mkdir -p ${DOTNET_ROOT} && \ ################################################################## # Setup $PATH ################################################################## -ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR} +ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR}:${OPENSSL_34_BIN_DIR} ################################################################## # Setup certs diff --git a/linux/ecosystem/epicmorg/debian/sid/dotnet/dotnet9/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/dotnet/dotnet9/Dockerfile index 7065df71d..1f3b7edcd 100644 --- a/linux/ecosystem/epicmorg/debian/sid/dotnet/dotnet9/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/dotnet/dotnet9/Dockerfile @@ -1,3 +1,6 @@ +FROM epicmorg/debian:sid-develop as builder +RUN echo "Just temp lyer to copy OpenSSL" + FROM epicmorg/debian:sid LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive @@ -11,6 +14,22 @@ ARG DOTNET_INSTALL_SCRIPT_URL=https://dotnet.microsoft.com/download/dotnet/scrip ENV DOTNET_CLI_TELEMETRY_OPTOUT=true ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true +################################################################## +# OpenSSL 3.4 +################################################################## +ENV OPENSSL_34_VERSION=3.4.1 +ENV OPENSSL_34_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_34_VERSION} +ENV OPENSSL_34_BIN_DIR=${OPENSSL_34_DIR}/bin +ENV OPENSSL_34_INC_DIR=${OPENSSL_34_DIR}/include +ENV OPENSSL_34_LIB_DIR=${OPENSSL_34_DIR}/lib64 +ENV OPENSSL_34_SRC_DIR=/usr/local/src/openssl/${OPENSSL_34_VERSION} + +COPY --from=builder ${OPENSSL_34_DIR} ${OPENSSL_34_DIR} +COPY --from=builder ${OPENSSL_34_SRC_DIR} ${OPENSSL_34_SRC_DIR} + +ENV OPENSSL_ROOT=${OPENSSL_34_DIR} +ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH + ################################################################## # installing dotnet ################################################################## @@ -22,7 +41,7 @@ RUN mkdir -p ${DOTNET_ROOT} && \ ################################################################## # Setup $PATH ################################################################## -ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR} +ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR}:${OPENSSL_34_BIN_DIR} ################################################################## # Version after install diff --git a/linux/ecosystem/epicmorg/debian/sid/dotnet/dotnet9/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/sid/dotnet/dotnet9/Dockerfile.develop index da3a80a26..911a44ccf 100644 --- a/linux/ecosystem/epicmorg/debian/sid/dotnet/dotnet9/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/sid/dotnet/dotnet9/Dockerfile.develop @@ -11,6 +11,9 @@ ARG DOTNET_INSTALL_SCRIPT_URL=https://dotnet.microsoft.com/download/dotnet/scrip ENV DOTNET_CLI_TELEMETRY_OPTOUT=true ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true +ENV OPENSSL_ROOT=${OPENSSL_34_DIR} +ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH + ################################################################## # installing dotnet ################################################################## @@ -22,7 +25,7 @@ RUN mkdir -p ${DOTNET_ROOT} && \ ################################################################## # Setup $PATH ################################################################## -ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR} +ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR}:${OPENSSL_34_BIN_DIR} ################################################################## # Setup certs diff --git a/linux/ecosystem/epicmorg/debian/sid/dotnet/lts/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/dotnet/lts/Dockerfile index aac1b9ce0..1e93c794d 100644 --- a/linux/ecosystem/epicmorg/debian/sid/dotnet/lts/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/dotnet/lts/Dockerfile @@ -1,3 +1,6 @@ +FROM epicmorg/debian:sid-develop as builder +RUN echo "Just temp lyer to copy OpenSSL" + FROM epicmorg/debian:sid LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive @@ -11,6 +14,22 @@ ARG DOTNET_INSTALL_SCRIPT_URL=https://dotnet.microsoft.com/download/dotnet/scrip ENV DOTNET_CLI_TELEMETRY_OPTOUT=true ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true +################################################################## +# OpenSSL 3.4 +################################################################## +ENV OPENSSL_34_VERSION=3.4.1 +ENV OPENSSL_34_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_34_VERSION} +ENV OPENSSL_34_BIN_DIR=${OPENSSL_34_DIR}/bin +ENV OPENSSL_34_INC_DIR=${OPENSSL_34_DIR}/include +ENV OPENSSL_34_LIB_DIR=${OPENSSL_34_DIR}/lib64 +ENV OPENSSL_34_SRC_DIR=/usr/local/src/openssl/${OPENSSL_34_VERSION} + +COPY --from=builder ${OPENSSL_34_DIR} ${OPENSSL_34_DIR} +COPY --from=builder ${OPENSSL_34_SRC_DIR} ${OPENSSL_34_SRC_DIR} + +ENV OPENSSL_ROOT=${OPENSSL_34_DIR} +ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH + ################################################################## # installing dotnet ################################################################## @@ -22,7 +41,7 @@ RUN mkdir -p ${DOTNET_ROOT} && \ ################################################################## # Setup $PATH ################################################################## -ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR} +ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR}:${OPENSSL_34_BIN_DIR} ################################################################## # Version after install diff --git a/linux/ecosystem/epicmorg/debian/sid/dotnet/lts/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/sid/dotnet/lts/Dockerfile.develop index be7fb00f2..47f038820 100644 --- a/linux/ecosystem/epicmorg/debian/sid/dotnet/lts/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/sid/dotnet/lts/Dockerfile.develop @@ -11,6 +11,9 @@ ARG DOTNET_INSTALL_SCRIPT_URL=https://dotnet.microsoft.com/download/dotnet/scrip ENV DOTNET_CLI_TELEMETRY_OPTOUT=true ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true +ENV OPENSSL_ROOT=${OPENSSL_34_DIR} +ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH + ################################################################## # installing dotnet ################################################################## @@ -22,7 +25,7 @@ RUN mkdir -p ${DOTNET_ROOT} && \ ################################################################## # Setup $PATH ################################################################## -ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR} +ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR}:${OPENSSL_34_BIN_DIR} ################################################################## # Setup certs diff --git a/linux/ecosystem/epicmorg/debian/sid/dotnet/sts/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/dotnet/sts/Dockerfile index c33677ec4..6000ed4fb 100644 --- a/linux/ecosystem/epicmorg/debian/sid/dotnet/sts/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/dotnet/sts/Dockerfile @@ -1,3 +1,6 @@ +FROM epicmorg/debian:sid-develop as builder +RUN echo "Just temp lyer to copy OpenSSL" + FROM epicmorg/debian:sid LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive @@ -11,6 +14,22 @@ ARG DOTNET_INSTALL_SCRIPT_URL=https://dotnet.microsoft.com/download/dotnet/scrip ENV DOTNET_CLI_TELEMETRY_OPTOUT=true ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true +################################################################## +# OpenSSL 3.4 +################################################################## +ENV OPENSSL_34_VERSION=3.4.1 +ENV OPENSSL_34_DIR=${EMG_LOCAL_BASE_DIR}/openssl/${OPENSSL_34_VERSION} +ENV OPENSSL_34_BIN_DIR=${OPENSSL_34_DIR}/bin +ENV OPENSSL_34_INC_DIR=${OPENSSL_34_DIR}/include +ENV OPENSSL_34_LIB_DIR=${OPENSSL_34_DIR}/lib64 +ENV OPENSSL_34_SRC_DIR=/usr/local/src/openssl/${OPENSSL_34_VERSION} + +COPY --from=builder ${OPENSSL_34_DIR} ${OPENSSL_34_DIR} +COPY --from=builder ${OPENSSL_34_SRC_DIR} ${OPENSSL_34_SRC_DIR} + +ENV OPENSSL_ROOT=${OPENSSL_34_DIR} +ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH + ################################################################## # installing dotnet ################################################################## @@ -22,7 +41,7 @@ RUN mkdir -p ${DOTNET_ROOT} && \ ################################################################## # Setup $PATH ################################################################## -ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR} +ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR}:${OPENSSL_34_BIN_DIR} ################################################################## # Version after install diff --git a/linux/ecosystem/epicmorg/debian/sid/dotnet/sts/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/sid/dotnet/sts/Dockerfile.develop index d4dadb1a0..2faab2d6b 100644 --- a/linux/ecosystem/epicmorg/debian/sid/dotnet/sts/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/sid/dotnet/sts/Dockerfile.develop @@ -11,6 +11,9 @@ ARG DOTNET_INSTALL_SCRIPT_URL=https://dotnet.microsoft.com/download/dotnet/scrip ENV DOTNET_CLI_TELEMETRY_OPTOUT=true ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true +ENV OPENSSL_ROOT=${OPENSSL_34_DIR} +ENV LD_LIBRARY_PATH=${OPENSSL_ROOT}/lib64:$LD_LIBRARY_PATH + ################################################################## # installing dotnet ################################################################## @@ -22,7 +25,7 @@ RUN mkdir -p ${DOTNET_ROOT} && \ ################################################################## # Setup $PATH ################################################################## -ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR} +ENV PATH=$PATH:${DOTNET_ROOT}:${DOTNET_TOOLS_DIR}:${OPENSSL_34_BIN_DIR} ################################################################## # Setup certs diff --git a/linux/ecosystem/epicmorg/debian/sid/python/3.12/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/python/3.12/Dockerfile index c5d60be52..c4e203acc 100644 --- a/linux/ecosystem/epicmorg/debian/sid/python/3.12/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/python/3.12/Dockerfile @@ -51,7 +51,7 @@ RUN ./configure \ --enable-loadable-sqlite-extensions \ --with-ensurepip=install \ --enable-profiling \ - --with-system-expat \ + # --with-system-expat \ --with-computed-gotos \ --with-pydebug \ --with-trace-refs \ diff --git a/linux/ecosystem/epicmorg/debian/sid/python/3.13/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/python/3.13/Dockerfile index bff04f7af..b06aa9523 100644 --- a/linux/ecosystem/epicmorg/debian/sid/python/3.13/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/python/3.13/Dockerfile @@ -51,7 +51,7 @@ RUN ./configure \ --enable-loadable-sqlite-extensions \ --with-ensurepip=install \ --enable-profiling \ - --with-system-expat \ + # --with-system-expat \ --with-computed-gotos \ --with-pydebug \ --with-trace-refs \ diff --git a/linux/ecosystem/epicmorg/debian/sid/python/README.md b/linux/ecosystem/epicmorg/debian/sid/python/README.md index c2cdf75a4..2df2ca322 100644 --- a/linux/ecosystem/epicmorg/debian/sid/python/README.md +++ b/linux/ecosystem/epicmorg/debian/sid/python/README.md @@ -1,20 +1,26 @@ # Version Compablity -| Python | OpenSSL | Comments | -| ------------- | ------------- | ----------------- | -| 2.6 | Not ready | No pip installed | -| 2.7 | Not ready | | -| 3.0 | 1.0.2u | No pip installed | -| 3.1 | 1.0.2u | No pip installed | -| 3.2 | 1.0.2u | | -| 3.3 | 1.0.2u | | -| 3.4 | 1.0.2u | | -| 3.5 | 1.1.1.1w | | -| 3.6 | 1.1.1.1w | | -| 3.7 | 1.1.1.1w | | -| 3.8 | 1.1.1.1w | | -| 3.9 | 1.1.1.1w | | -| 3.10 | 3.4.x | | -| 3.11 | 3.4.x | | -| 3.12 | 3.4.x | | -| 3.13 | 3.4.x | | +## Status of Python versions + +https://devguide.python.org/versions/ + +| Python | OpenSSL | Comments | Status | +| ------------- | ------------- | ----------------- | --------- | +| 2.6 | Not ready | No pip installed | End Of Life | +| 2.7 | Not ready | | End Of Life | +| 3.0 | Not ready | No pip installed | End Of Life | +| 3.1 | Not ready | No pip installed | End Of Life | +| 3.2 | 1.0.2u | | End Of Life | +| 3.3 | 1.0.2u | | End Of Life | +| 3.4 | 1.0.2u | | End Of Life | +| 3.5 | 1.1.1.1w | | End Of Life | +| 3.6 | 1.1.1.1w | | End Of Life | +| 3.7 | 1.1.1.1w | | End Of Life | +| 3.8 | 1.1.1.1w | | End Of Life | +| 3.9 | 1.1.1.1w | | security, 2025-10 | +| 3.10 | 3.4.x | | security, 2026-10 | +| 3.11 | 3.4.x | | security, 2029-10 | +| 3.12 | 3.4.x | | bugfix, 2028-10 | +| 3.13 | 3.4.x | | bugfix, 2029-10 | + +Only supported versions will be automaticly updated at CI.