From c75f3660f6011d7096cbe647afdf330c586c16f8 Mon Sep 17 00:00:00 2001 From: Hugo Gomes Date: Tue, 30 Apr 2024 12:15:12 +0100 Subject: [PATCH 01/13] adding ubuntu 24.04 --- ubuntu/Dockerfile.noble | 19 +++++++++++++++++++ ubuntu_dev/Dockerfile.noble | 13 +++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 ubuntu/Dockerfile.noble create mode 100644 ubuntu_dev/Dockerfile.noble diff --git a/ubuntu/Dockerfile.noble b/ubuntu/Dockerfile.noble new file mode 100644 index 0000000..6ad771e --- /dev/null +++ b/ubuntu/Dockerfile.noble @@ -0,0 +1,19 @@ +FROM ubuntu:noble + +LABEL version="1.0" +LABEL maintainer="Hive Solutions " + +ARG DEBIAN_FRONTEND=noninteractive + +RUN apt-get update &&\ + apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python2 python3 python3-distutils &&\ + ln -s /usr/bin/python2 /usr/bin/python &&\ + apt-get clean && rm -rf /var/lib/apt/lists/* &&\ + wget "https://bootstrap.pypa.io/get-pip.py" &&\ + wget "https://bootstrap.pypa.io/pip/2.7/get-pip.py" -O get-pip-2.py &&\ + python3 get-pip.py --no-cache-dir --no-compile &&\ + python get-pip-2.py --no-cache-dir --no-compile &&\ + rm get-pip.py &&\ + rm get-pip-2.py + +CMD ["/bin/bash"] diff --git a/ubuntu_dev/Dockerfile.noble b/ubuntu_dev/Dockerfile.noble new file mode 100644 index 0000000..3307f62 --- /dev/null +++ b/ubuntu_dev/Dockerfile.noble @@ -0,0 +1,13 @@ +FROM hivesolutions/ubuntu:noble + +LABEL version="1.0" +LABEL maintainer="Hive Solutions " + +ARG DEBIAN_FRONTEND=noninteractive + +RUN apt-get update &&\ + apt-get install -y -q --no-install-recommends sudo gcc make curl pypy linux-headers-generic\ + libssl-dev python2-dev python3-dev pypy-dev &&\ + apt-get clean && rm -rf /var/lib/apt/lists/* + +CMD ["/bin/bash"] From ba28cdb86bba869328f79c305f5ab4672b5b5c9f Mon Sep 17 00:00:00 2001 From: Hugo Gomes Date: Tue, 30 Apr 2024 12:16:38 +0100 Subject: [PATCH 02/13] updating dockerx worflow w/ ubuntu 24.04 --- .github/workflows/dockerx_ubuntu.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/dockerx_ubuntu.yml b/.github/workflows/dockerx_ubuntu.yml index fe7db8a..5396c5d 100644 --- a/.github/workflows/dockerx_ubuntu.yml +++ b/.github/workflows/dockerx_ubuntu.yml @@ -21,12 +21,14 @@ jobs: - { dockerfile: "ubuntu/Dockerfile.bionic", context: "ubuntu", image_name: "ubuntu", tag_name: "bionic" } - { dockerfile: "ubuntu/Dockerfile.focal", context: "ubuntu", image_name: "ubuntu", tag_name: "focal" } - { dockerfile: "ubuntu/Dockerfile.jammy", context: "ubuntu", image_name: "ubuntu", tag_name: "jammy" } + - { dockerfile: "ubuntu/Dockerfile.noble", context: "ubuntu", image_name: "ubuntu", tag_name: "noble" } - { dockerfile: "ubuntu_dev/Dockerfile", context: "ubuntu_dev", image_name: "ubuntu_dev", tag_name: "latest" } - { dockerfile: "ubuntu_dev/Dockerfile.rolling", context: "ubuntu_dev", image_name: "ubuntu_dev", tag_name: "rolling" } - { dockerfile: "ubuntu_dev/Dockerfile.xenial", context: "ubuntu_dev", image_name: "ubuntu_dev", tag_name: "xenial" } - { dockerfile: "ubuntu_dev/Dockerfile.bionic", context: "ubuntu_dev", image_name: "ubuntu_dev", tag_name: "bionic" } - { dockerfile: "ubuntu_dev/Dockerfile.focal", context: "ubuntu_dev", image_name: "ubuntu_dev", tag_name: "focal" } - { dockerfile: "ubuntu_dev/Dockerfile.jammy", context: "ubuntu_dev", image_name: "ubuntu_dev", tag_name: "jammy" } + - { dockerfile: "ubuntu_dev/Dockerfile.noble", context: "ubuntu_dev", image_name: "ubuntu_dev", tag_name: "noble" } runs-on: self-hosted steps: - name: Checkout code From 595666076cacfe47696b5816a44b4e7fc835ef08 Mon Sep 17 00:00:00 2001 From: Hugo Gomes Date: Tue, 30 Apr 2024 12:48:47 +0100 Subject: [PATCH 03/13] python2 is removed due to its incompatibility with libssl 3 on ubuntu noble --- ubuntu/Dockerfile | 8 ++------ ubuntu/Dockerfile.noble | 8 ++------ ubuntu_dev/Dockerfile | 2 +- ubuntu_dev/Dockerfile.noble | 2 +- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile index d2744ad..322cbf0 100644 --- a/ubuntu/Dockerfile +++ b/ubuntu/Dockerfile @@ -6,14 +6,10 @@ LABEL maintainer="Hive Solutions " ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update &&\ - apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python2 python3 python3-distutils &&\ - ln -s /usr/bin/python2 /usr/bin/python &&\ + apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python3 python3-distutils &&\ apt-get clean && rm -rf /var/lib/apt/lists/* &&\ wget "https://bootstrap.pypa.io/get-pip.py" &&\ - wget "https://bootstrap.pypa.io/pip/2.7/get-pip.py" -O get-pip-2.py &&\ python3 get-pip.py --no-cache-dir --no-compile &&\ - python get-pip-2.py --no-cache-dir --no-compile &&\ - rm get-pip.py &&\ - rm get-pip-2.py + rm get-pip.py CMD ["/bin/bash"] diff --git a/ubuntu/Dockerfile.noble b/ubuntu/Dockerfile.noble index 6ad771e..6c57cb2 100644 --- a/ubuntu/Dockerfile.noble +++ b/ubuntu/Dockerfile.noble @@ -6,14 +6,10 @@ LABEL maintainer="Hive Solutions " ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update &&\ - apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python2 python3 python3-distutils &&\ - ln -s /usr/bin/python2 /usr/bin/python &&\ + apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python3 python3-distutils &&\ apt-get clean && rm -rf /var/lib/apt/lists/* &&\ wget "https://bootstrap.pypa.io/get-pip.py" &&\ - wget "https://bootstrap.pypa.io/pip/2.7/get-pip.py" -O get-pip-2.py &&\ python3 get-pip.py --no-cache-dir --no-compile &&\ - python get-pip-2.py --no-cache-dir --no-compile &&\ - rm get-pip.py &&\ - rm get-pip-2.py + rm get-pip.py CMD ["/bin/bash"] diff --git a/ubuntu_dev/Dockerfile b/ubuntu_dev/Dockerfile index 827b5ca..fc3250f 100644 --- a/ubuntu_dev/Dockerfile +++ b/ubuntu_dev/Dockerfile @@ -7,7 +7,7 @@ ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update &&\ apt-get install -y -q --no-install-recommends sudo gcc make curl pypy linux-headers-generic\ - libssl-dev python2-dev python3-dev pypy-dev &&\ + libssl-dev python3-dev pypy-dev &&\ apt-get clean && rm -rf /var/lib/apt/lists/* CMD ["/bin/bash"] diff --git a/ubuntu_dev/Dockerfile.noble b/ubuntu_dev/Dockerfile.noble index 3307f62..7afd16c 100644 --- a/ubuntu_dev/Dockerfile.noble +++ b/ubuntu_dev/Dockerfile.noble @@ -7,7 +7,7 @@ ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update &&\ apt-get install -y -q --no-install-recommends sudo gcc make curl pypy linux-headers-generic\ - libssl-dev python2-dev python3-dev pypy-dev &&\ + libssl-dev python3-dev pypy-dev &&\ apt-get clean && rm -rf /var/lib/apt/lists/* CMD ["/bin/bash"] From 526402f866f7bc2bd2ae93d113aa8eec93fd0ad5 Mon Sep 17 00:00:00 2001 From: Hugo Gomes Date: Tue, 30 Apr 2024 12:51:28 +0100 Subject: [PATCH 04/13] python2 is removed due to its incompatibility with libssl 3 on ubuntu noble --- ubuntu/Dockerfile | 4 ++-- ubuntu/Dockerfile.noble | 4 ++-- ubuntu_dev/Dockerfile | 2 +- ubuntu_dev/Dockerfile.noble | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile index 322cbf0..df620c0 100644 --- a/ubuntu/Dockerfile +++ b/ubuntu/Dockerfile @@ -6,10 +6,10 @@ LABEL maintainer="Hive Solutions " ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update &&\ - apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python3 python3-distutils &&\ + apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python python-distutils &&\ apt-get clean && rm -rf /var/lib/apt/lists/* &&\ wget "https://bootstrap.pypa.io/get-pip.py" &&\ - python3 get-pip.py --no-cache-dir --no-compile &&\ + python get-pip.py --no-cache-dir --no-compile &&\ rm get-pip.py CMD ["/bin/bash"] diff --git a/ubuntu/Dockerfile.noble b/ubuntu/Dockerfile.noble index 6c57cb2..86ee7f0 100644 --- a/ubuntu/Dockerfile.noble +++ b/ubuntu/Dockerfile.noble @@ -6,10 +6,10 @@ LABEL maintainer="Hive Solutions " ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update &&\ - apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python3 python3-distutils &&\ + apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python python-distutils &&\ apt-get clean && rm -rf /var/lib/apt/lists/* &&\ wget "https://bootstrap.pypa.io/get-pip.py" &&\ - python3 get-pip.py --no-cache-dir --no-compile &&\ + python get-pip.py --no-cache-dir --no-compile &&\ rm get-pip.py CMD ["/bin/bash"] diff --git a/ubuntu_dev/Dockerfile b/ubuntu_dev/Dockerfile index fc3250f..7c4b905 100644 --- a/ubuntu_dev/Dockerfile +++ b/ubuntu_dev/Dockerfile @@ -7,7 +7,7 @@ ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update &&\ apt-get install -y -q --no-install-recommends sudo gcc make curl pypy linux-headers-generic\ - libssl-dev python3-dev pypy-dev &&\ + libssl-dev python-dev pypy-dev &&\ apt-get clean && rm -rf /var/lib/apt/lists/* CMD ["/bin/bash"] diff --git a/ubuntu_dev/Dockerfile.noble b/ubuntu_dev/Dockerfile.noble index 7afd16c..6380506 100644 --- a/ubuntu_dev/Dockerfile.noble +++ b/ubuntu_dev/Dockerfile.noble @@ -7,7 +7,7 @@ ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update &&\ apt-get install -y -q --no-install-recommends sudo gcc make curl pypy linux-headers-generic\ - libssl-dev python3-dev pypy-dev &&\ + libssl-dev python-dev pypy-dev &&\ apt-get clean && rm -rf /var/lib/apt/lists/* CMD ["/bin/bash"] From 52759f04a8207e2581b2143c6ea8ecc6cd0aa18b Mon Sep 17 00:00:00 2001 From: Hugo Gomes Date: Tue, 30 Apr 2024 13:00:26 +0100 Subject: [PATCH 05/13] python2 is removed due to its incompatibility with libssl 3 on ubuntu noble --- ubuntu/Dockerfile | 2 +- ubuntu/Dockerfile.noble | 2 +- ubuntu_dev/Dockerfile | 2 +- ubuntu_dev/Dockerfile.noble | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile index df620c0..5686d19 100644 --- a/ubuntu/Dockerfile +++ b/ubuntu/Dockerfile @@ -6,7 +6,7 @@ LABEL maintainer="Hive Solutions " ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update &&\ - apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python python-distutils &&\ + apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python3 python3-distutils &&\ apt-get clean && rm -rf /var/lib/apt/lists/* &&\ wget "https://bootstrap.pypa.io/get-pip.py" &&\ python get-pip.py --no-cache-dir --no-compile &&\ diff --git a/ubuntu/Dockerfile.noble b/ubuntu/Dockerfile.noble index 86ee7f0..5170c7f 100644 --- a/ubuntu/Dockerfile.noble +++ b/ubuntu/Dockerfile.noble @@ -6,7 +6,7 @@ LABEL maintainer="Hive Solutions " ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update &&\ - apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python python-distutils &&\ + apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python3 python3-distutils &&\ apt-get clean && rm -rf /var/lib/apt/lists/* &&\ wget "https://bootstrap.pypa.io/get-pip.py" &&\ python get-pip.py --no-cache-dir --no-compile &&\ diff --git a/ubuntu_dev/Dockerfile b/ubuntu_dev/Dockerfile index 7c4b905..fc3250f 100644 --- a/ubuntu_dev/Dockerfile +++ b/ubuntu_dev/Dockerfile @@ -7,7 +7,7 @@ ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update &&\ apt-get install -y -q --no-install-recommends sudo gcc make curl pypy linux-headers-generic\ - libssl-dev python-dev pypy-dev &&\ + libssl-dev python3-dev pypy-dev &&\ apt-get clean && rm -rf /var/lib/apt/lists/* CMD ["/bin/bash"] diff --git a/ubuntu_dev/Dockerfile.noble b/ubuntu_dev/Dockerfile.noble index 6380506..7afd16c 100644 --- a/ubuntu_dev/Dockerfile.noble +++ b/ubuntu_dev/Dockerfile.noble @@ -7,7 +7,7 @@ ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update &&\ apt-get install -y -q --no-install-recommends sudo gcc make curl pypy linux-headers-generic\ - libssl-dev python-dev pypy-dev &&\ + libssl-dev python3-dev pypy-dev &&\ apt-get clean && rm -rf /var/lib/apt/lists/* CMD ["/bin/bash"] From e44dabaeaa99f2e8ab6a9ca54f65a252b5610bfd Mon Sep 17 00:00:00 2001 From: Hugo Gomes Date: Tue, 30 Apr 2024 13:01:24 +0100 Subject: [PATCH 06/13] python distutils is deprecated with removal on python 3.12 --- ubuntu/Dockerfile | 2 +- ubuntu/Dockerfile.bionic | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile index 5686d19..dd6461b 100644 --- a/ubuntu/Dockerfile +++ b/ubuntu/Dockerfile @@ -6,7 +6,7 @@ LABEL maintainer="Hive Solutions " ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update &&\ - apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python3 python3-distutils &&\ + apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python3 &&\ apt-get clean && rm -rf /var/lib/apt/lists/* &&\ wget "https://bootstrap.pypa.io/get-pip.py" &&\ python get-pip.py --no-cache-dir --no-compile &&\ diff --git a/ubuntu/Dockerfile.bionic b/ubuntu/Dockerfile.bionic index 038478a..712ed83 100644 --- a/ubuntu/Dockerfile.bionic +++ b/ubuntu/Dockerfile.bionic @@ -6,7 +6,7 @@ LABEL maintainer="Hive Solutions " ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update &&\ - apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python python3 python3-distutils &&\ + apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python python3 &&\ apt-get clean && rm -rf /var/lib/apt/lists/* &&\ wget "https://bootstrap.pypa.io/pip/3.6/get-pip.py" &&\ wget "https://bootstrap.pypa.io/pip/2.7/get-pip.py" -O get-pip-2.py &&\ From 1f7fe3a61e27b9d251b7c8cc6a70bbad94380e8c Mon Sep 17 00:00:00 2001 From: Hugo Gomes Date: Tue, 30 Apr 2024 13:04:58 +0100 Subject: [PATCH 07/13] python distutils is deprecated with removal on python 3.12 --- ubuntu/Dockerfile.noble | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/Dockerfile.noble b/ubuntu/Dockerfile.noble index 5170c7f..ab2ee46 100644 --- a/ubuntu/Dockerfile.noble +++ b/ubuntu/Dockerfile.noble @@ -6,7 +6,7 @@ LABEL maintainer="Hive Solutions " ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update &&\ - apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python3 python3-distutils &&\ + apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python3 &&\ apt-get clean && rm -rf /var/lib/apt/lists/* &&\ wget "https://bootstrap.pypa.io/get-pip.py" &&\ python get-pip.py --no-cache-dir --no-compile &&\ From 7867c2b2b4f9083e0d5edbae8162377bf01750fb Mon Sep 17 00:00:00 2001 From: Hugo Gomes Date: Tue, 30 Apr 2024 13:08:58 +0100 Subject: [PATCH 08/13] ensure 'python' commands uses python3 by adding python-is-python3 --- ubuntu/Dockerfile | 2 +- ubuntu/Dockerfile.noble | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile index dd6461b..d020029 100644 --- a/ubuntu/Dockerfile +++ b/ubuntu/Dockerfile @@ -6,7 +6,7 @@ LABEL maintainer="Hive Solutions " ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update &&\ - apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python3 &&\ + apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python3 python-is-python3 &&\ apt-get clean && rm -rf /var/lib/apt/lists/* &&\ wget "https://bootstrap.pypa.io/get-pip.py" &&\ python get-pip.py --no-cache-dir --no-compile &&\ diff --git a/ubuntu/Dockerfile.noble b/ubuntu/Dockerfile.noble index ab2ee46..434850f 100644 --- a/ubuntu/Dockerfile.noble +++ b/ubuntu/Dockerfile.noble @@ -6,7 +6,7 @@ LABEL maintainer="Hive Solutions " ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update &&\ - apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python3 &&\ + apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python3 python-is-python3 &&\ apt-get clean && rm -rf /var/lib/apt/lists/* &&\ wget "https://bootstrap.pypa.io/get-pip.py" &&\ python get-pip.py --no-cache-dir --no-compile &&\ From b7eaa562b44b0ac4190a4af212563c2bfe304cf8 Mon Sep 17 00:00:00 2001 From: Hugo Gomes Date: Tue, 30 Apr 2024 14:32:20 +0100 Subject: [PATCH 09/13] add --break-system-packages flag to allow system-wide python package installations --- ubuntu/Dockerfile | 2 +- ubuntu/Dockerfile.noble | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile index d020029..f7186db 100644 --- a/ubuntu/Dockerfile +++ b/ubuntu/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update &&\ apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python3 python-is-python3 &&\ apt-get clean && rm -rf /var/lib/apt/lists/* &&\ wget "https://bootstrap.pypa.io/get-pip.py" &&\ - python get-pip.py --no-cache-dir --no-compile &&\ + python get-pip.py --no-cache-dir --no-compile --break-system-packages &&\ rm get-pip.py CMD ["/bin/bash"] diff --git a/ubuntu/Dockerfile.noble b/ubuntu/Dockerfile.noble index 434850f..218f097 100644 --- a/ubuntu/Dockerfile.noble +++ b/ubuntu/Dockerfile.noble @@ -9,7 +9,7 @@ RUN apt-get update &&\ apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python3 python-is-python3 &&\ apt-get clean && rm -rf /var/lib/apt/lists/* &&\ wget "https://bootstrap.pypa.io/get-pip.py" &&\ - python get-pip.py --no-cache-dir --no-compile &&\ + python get-pip.py --no-cache-dir --no-compile --break-system-packages &&\ rm get-pip.py CMD ["/bin/bash"] From d083cba9d07bee40e8807eecd2af57400b802107 Mon Sep 17 00:00:00 2001 From: Hugo Gomes Date: Tue, 30 Apr 2024 14:58:25 +0100 Subject: [PATCH 10/13] review pypy packages on ubuntu noble --- ubuntu_dev/Dockerfile | 4 ++-- ubuntu_dev/Dockerfile.noble | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ubuntu_dev/Dockerfile b/ubuntu_dev/Dockerfile index fc3250f..873fcab 100644 --- a/ubuntu_dev/Dockerfile +++ b/ubuntu_dev/Dockerfile @@ -6,8 +6,8 @@ LABEL maintainer="Hive Solutions " ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update &&\ - apt-get install -y -q --no-install-recommends sudo gcc make curl pypy linux-headers-generic\ - libssl-dev python3-dev pypy-dev &&\ + apt-get install -y -q --no-install-recommends sudo gcc make curl pypy3 linux-headers-generic\ + libssl-dev python3-dev pypy3-dev &&\ apt-get clean && rm -rf /var/lib/apt/lists/* CMD ["/bin/bash"] diff --git a/ubuntu_dev/Dockerfile.noble b/ubuntu_dev/Dockerfile.noble index 7afd16c..58890d7 100644 --- a/ubuntu_dev/Dockerfile.noble +++ b/ubuntu_dev/Dockerfile.noble @@ -6,8 +6,8 @@ LABEL maintainer="Hive Solutions " ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update &&\ - apt-get install -y -q --no-install-recommends sudo gcc make curl pypy linux-headers-generic\ - libssl-dev python3-dev pypy-dev &&\ + apt-get install -y -q --no-install-recommends sudo gcc make curl pypy3 linux-headers-generic\ + libssl-dev python3-dev pypy3-dev &&\ apt-get clean && rm -rf /var/lib/apt/lists/* CMD ["/bin/bash"] From 3c846f588be132e278c205a9409b0343066ca413 Mon Sep 17 00:00:00 2001 From: Hugo Gomes Date: Tue, 30 Apr 2024 14:58:34 +0100 Subject: [PATCH 11/13] review rolling tag --- ubuntu/Dockerfile.rolling | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ubuntu/Dockerfile.rolling b/ubuntu/Dockerfile.rolling index bbcd2b1..c0ca409 100644 --- a/ubuntu/Dockerfile.rolling +++ b/ubuntu/Dockerfile.rolling @@ -6,11 +6,10 @@ LABEL maintainer="Hive Solutions " ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update &&\ - apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python3 python3-distutils &&\ + apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python3 python-is-python3 &&\ apt-get clean && rm -rf /var/lib/apt/lists/* &&\ - rm /usr/lib/python3.11/EXTERNALLY-MANAGED &&\ wget "https://bootstrap.pypa.io/get-pip.py" &&\ - python3 get-pip.py --no-cache-dir --no-compile &&\ + python get-pip.py --no-cache-dir --no-compile --break-system-packages &&\ rm get-pip.py CMD ["/bin/bash"] From 6652e5c760286312cbbb7d81f86570c9711bdf0b Mon Sep 17 00:00:00 2001 From: Hugo Gomes Date: Tue, 30 Apr 2024 15:03:55 +0100 Subject: [PATCH 12/13] revert change --- ubuntu/Dockerfile.bionic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/Dockerfile.bionic b/ubuntu/Dockerfile.bionic index 712ed83..038478a 100644 --- a/ubuntu/Dockerfile.bionic +++ b/ubuntu/Dockerfile.bionic @@ -6,7 +6,7 @@ LABEL maintainer="Hive Solutions " ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update &&\ - apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python python3 &&\ + apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python python3 python3-distutils &&\ apt-get clean && rm -rf /var/lib/apt/lists/* &&\ wget "https://bootstrap.pypa.io/pip/3.6/get-pip.py" &&\ wget "https://bootstrap.pypa.io/pip/2.7/get-pip.py" -O get-pip-2.py &&\ From 5be4c03224e09652757c3513d034b3b326e6682c Mon Sep 17 00:00:00 2001 From: Hugo Gomes Date: Fri, 3 May 2024 18:41:06 +0100 Subject: [PATCH 13/13] update base image to ubuntu:jammy in hivesolutions/ubuntu --- ubuntu/Dockerfile | 12 ++++++++---- ubuntu_dev/Dockerfile | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile index f7186db..ba78cb7 100644 --- a/ubuntu/Dockerfile +++ b/ubuntu/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:latest +FROM ubuntu:jammy LABEL version="1.0" LABEL maintainer="Hive Solutions " @@ -6,10 +6,14 @@ LABEL maintainer="Hive Solutions " ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update &&\ - apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python3 python-is-python3 &&\ + apt-get install -y -q --no-install-recommends sudo bash wget git openssl unzip ca-certificates dirmngr apt-transport-https python2 python3 python3-distutils &&\ + ln -s /usr/bin/python2 /usr/bin/python &&\ apt-get clean && rm -rf /var/lib/apt/lists/* &&\ wget "https://bootstrap.pypa.io/get-pip.py" &&\ - python get-pip.py --no-cache-dir --no-compile --break-system-packages &&\ - rm get-pip.py + wget "https://bootstrap.pypa.io/pip/2.7/get-pip.py" -O get-pip-2.py &&\ + python3 get-pip.py --no-cache-dir --no-compile &&\ + python get-pip-2.py --no-cache-dir --no-compile &&\ + rm get-pip.py &&\ + rm get-pip-2.py CMD ["/bin/bash"] diff --git a/ubuntu_dev/Dockerfile b/ubuntu_dev/Dockerfile index 873fcab..827b5ca 100644 --- a/ubuntu_dev/Dockerfile +++ b/ubuntu_dev/Dockerfile @@ -6,8 +6,8 @@ LABEL maintainer="Hive Solutions " ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update &&\ - apt-get install -y -q --no-install-recommends sudo gcc make curl pypy3 linux-headers-generic\ - libssl-dev python3-dev pypy3-dev &&\ + apt-get install -y -q --no-install-recommends sudo gcc make curl pypy linux-headers-generic\ + libssl-dev python2-dev python3-dev pypy-dev &&\ apt-get clean && rm -rf /var/lib/apt/lists/* CMD ["/bin/bash"]