diff --git a/CMakeLists.txt b/CMakeLists.txt index 59d85d13..f6e81084 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.11) -project(marblerun VERSION 1.4.0) +project(marblerun VERSION 1.4.1) find_package(OpenEnclave CONFIG REQUIRED) if (NOT CMAKE_BUILD_TYPE) diff --git a/dockerfiles/Dockerfile.build-base b/dockerfiles/Dockerfile.build-base index ea910ee8..10389e7b 100644 --- a/dockerfiles/Dockerfile.build-base +++ b/dockerfiles/Dockerfile.build-base @@ -1,4 +1,4 @@ -FROM ubuntu:jammy-20231128 +FROM ubuntu:jammy-20240212 RUN apt-get update && apt-get install -dy --no-install-recommends \ build-essential \ ca-certificates \ diff --git a/dockerfiles/Dockerfile.build-base-focal b/dockerfiles/Dockerfile.build-base-focal index 19c77515..983eba81 100644 --- a/dockerfiles/Dockerfile.build-base-focal +++ b/dockerfiles/Dockerfile.build-base-focal @@ -4,7 +4,7 @@ RUN wget \ https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage \ https://github.com/AppImage/type2-runtime/releases/download/continuous/runtime-x86_64 -FROM ubuntu:focal-20231128 +FROM ubuntu:focal-20240123 COPY --from=download /intel-sgx-deb.key /etc/apt/keyrings/intel-sgx-keyring.asc COPY --from=download /*-x86_64* / RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates \ diff --git a/dockerfiles/Dockerfile.cli b/dockerfiles/Dockerfile.cli index 723b461e..e3d48907 100644 --- a/dockerfiles/Dockerfile.cli +++ b/dockerfiles/Dockerfile.cli @@ -1,4 +1,4 @@ -FROM ghcr.io/edgelesssys/marblerun/build-base-focal:v1.4.0 AS build +FROM ghcr.io/edgelesssys/marblerun/build-base-focal:v1.4.1 AS build # don't run `apt-get update` because required packages are cached in build-base for reproducibility RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ @@ -12,8 +12,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ ninja-build \ wget -ARG erttag=v0.4.1 -ARG mrtag=v1.4.0 +ARG erttag=v0.4.2 +ARG mrtag=v1.4.1 ARG goversion=1.20.6 RUN wget -qO- https://go.dev/dl/go${goversion}.linux-amd64.tar.gz | tar -C /usr/local -xz \ && git clone -b $erttag --depth=1 https://github.com/edgelesssys/edgelessrt \ diff --git a/dockerfiles/Dockerfile.coordinator b/dockerfiles/Dockerfile.coordinator index 2297c01d..99dd418e 100644 --- a/dockerfiles/Dockerfile.coordinator +++ b/dockerfiles/Dockerfile.coordinator @@ -1,4 +1,4 @@ -FROM ghcr.io/edgelesssys/marblerun/build-base:v1.4.0 AS build +FROM ghcr.io/edgelesssys/marblerun/build-base:v1.4.1 AS build # don't run `apt-get update` because required packages are cached in build-base for reproducibility RUN apt-get install -y --no-install-recommends \ @@ -11,8 +11,8 @@ RUN apt-get install -y --no-install-recommends \ ninja-build \ wget -ARG erttag=v0.4.1 -ARG mrtag=v1.4.0 +ARG erttag=v0.4.2 +ARG mrtag=v1.4.1 ARG goversion=1.20.6 RUN wget -qO- https://go.dev/dl/go${goversion}.linux-amd64.tar.gz | tar -C /usr/local -xz \ && git clone -b $erttag --depth=1 https://github.com/edgelesssys/edgelessrt \ @@ -43,7 +43,7 @@ COPY --from=build \ COPY --from=build /mrbuild/marblerun /marblerun-ubuntu-22.04 # the coordinator container image -FROM ubuntu:jammy-20231128 AS release +FROM ubuntu:jammy-20240212 AS release ARG PSW_VERSION=2.22.100.3-jammy1 ARG DCAP_VERSION=1.19.100.3-jammy1 RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates libcurl4 wget \