From ea6157004c1d5992d47c16aa651fe741c37b6042 Mon Sep 17 00:00:00 2001 From: g2flyer Date: Wed, 24 Jan 2024 19:38:35 -0800 Subject: [PATCH 1/2] Upgrade docker images from 20.04 to 22.04 Signed-off-by: g2flyer --- docker/pdo_base.dockerfile | 6 +++--- docker/pdo_services_base.dockerfile | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/docker/pdo_base.dockerfile b/docker/pdo_base.dockerfile index 6ecf456e..5be86fa7 100644 --- a/docker/pdo_base.dockerfile +++ b/docker/pdo_base.dockerfile @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # ------------------------------------------------------------------------------ -ARG UBUNTU_VERSION=20.04 -ARG UBUNTU_NAME=focal +ARG UBUNTU_VERSION=22.04 +ARG UBUNTU_NAME=jammy FROM ubuntu:${UBUNTU_VERSION} @@ -48,7 +48,7 @@ RUN apt-get update \ ocamlbuild \ pkg-config \ protobuf-compiler \ - python \ + python3 \ python3-dev \ python3-venv \ python3-virtualenv \ diff --git a/docker/pdo_services_base.dockerfile b/docker/pdo_services_base.dockerfile index 54dba179..ef813eee 100644 --- a/docker/pdo_services_base.dockerfile +++ b/docker/pdo_services_base.dockerfile @@ -17,8 +17,8 @@ ARG PDO_VERSION FROM pdo_base:${PDO_VERSION} -ARG UBUNTU_VERSION=20.04 -ARG UBUNTU_NAME=focal +ARG UBUNTU_VERSION=22.04 +ARG UBUNTU_NAME=jammy ARG SGX=2.22 ARG OPENSSL=3.0.12 @@ -59,8 +59,7 @@ ENV SGX_SDK=/opt/intel/sgxsdk # has 2.30 but Intel ships binary distro for 2.32.51.20190719 # ----------------------------------------------------------------- WORKDIR /opt/intel -RUN [ "$UBUNTU_VERSION" = "20.04" ] \ - && SGX_SDK_BINUTILS_REPO=https://download.01.org/intel-sgx/sgx-linux/${SGX} \ +RUN SGX_SDK_BINUTILS_REPO=https://download.01.org/intel-sgx/sgx-linux/${SGX} \ && SGX_SDK_BINUTILS_FILE=$(wget -P /tmp --delete-after --spider --recursive --level=1 --no-parent ${SGX_SDK_BINUTILS_REPO} 2>&1 | perl -ne 'if (m|'${SGX_SDK_BINUTILS_REPO}'/(as.ld.objdump.*)|) { print "$1\n"; }') \ && wget -q -P /tmp ${SGX_SDK_BINUTILS_REPO}/${SGX_SDK_BINUTILS_FILE} \ && mkdir sgxsdk.extras \ From 07a78f1756fcdbf49dcfde12f4afd0380ec48210 Mon Sep 17 00:00:00 2001 From: g2flyer Date: Tue, 30 Jan 2024 08:21:16 -0800 Subject: [PATCH 2/2] Removal of docker ARG duplicates Signed-off-by: g2flyer --- docker/pdo_client.dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docker/pdo_client.dockerfile b/docker/pdo_client.dockerfile index 3bf8cf6a..df44ce1d 100644 --- a/docker/pdo_client.dockerfile +++ b/docker/pdo_client.dockerfile @@ -30,7 +30,7 @@ ARG UNAME=pdo_client ENV UNAME=${UNAME} ARG UID=1000 -ARG GID=$UID +ARG GID=${UID} RUN groupadd -f -g $GID -o $UNAME RUN useradd -m -u $UID -g $GID -d /project/pdo -o -s /bin/bash $UNAME @@ -68,8 +68,6 @@ WORKDIR /project/pdo/tools COPY --chown=${UNAME}:${UNAME} tools/*.sh ./ # build it!!! -ARG UID=1000 -ARG GID=${UID} RUN --mount=type=cache,uid=${UID},gid=${GID},target=/project/pdo/.cache/pip \ /project/pdo/tools/build_client.sh