diff --git a/README.md b/README.md index f229a0b62..a4536edeb 100644 --- a/README.md +++ b/README.md @@ -27,12 +27,13 @@ Key features of Edgeless RT are: If you're on Ubuntu 20.04, 22.04, or 24.04 (experimental) and don't want to build the SDK yourself, you can install the binary release: ```bash +ERT_VER=0.x.x # replace with latest version sudo mkdir -p /etc/apt/keyrings wget -qO- https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | sudo tee /etc/apt/keyrings/intel-sgx-keyring.asc > /dev/null echo "deb [signed-by=/etc/apt/keyrings/intel-sgx-keyring.asc arch=amd64] https://download.01.org/intel-sgx/sgx_repo/ubuntu $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/intel-sgx.list sudo apt update -ERT_DEB=edgelessrt_0.4.13_amd64_ubuntu-$(lsb_release -rs).deb -wget https://github.com/edgelesssys/edgelessrt/releases/download/v0.4.13/$ERT_DEB +ERT_DEB=edgelessrt_$ERT_VER_amd64_ubuntu-$(lsb_release -rs).deb +wget https://github.com/edgelesssys/edgelessrt/releases/download/v$ERT_VER/$ERT_DEB sudo apt install ./$ERT_DEB build-essential cmake libssl-dev ``` diff --git a/VERSION b/VERSION index b043aa648..992ac75e2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0.5.0 +v0.5.1 diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index b8f34cf47..e497018ed 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/edgelesssys/edgelessrt/build-base:v0.5.0 AS build +FROM ghcr.io/edgelesssys/edgelessrt/build-base:v0.5.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,7 +11,7 @@ RUN apt-get install -y --no-install-recommends \ ninja-build \ wget -ARG erttag=v0.5.0 +ARG erttag=v0.5.1 RUN git clone -b $erttag --depth=1 https://github.com/edgelesssys/edgelessrt \ && mkdir build @@ -26,13 +26,13 @@ FROM scratch AS export COPY --from=build /build/edgelessrt_*_amd64_ubuntu-22.04.deb / -FROM ubuntu:jammy-20251013 AS release_deploy +FROM ubuntu:jammy-20260109 AS release_deploy LABEL description="Containerized SGX for release" -ARG PSW_VERSION=2.26.100.0-jammy1 -ARG DCAP_VERSION=1.23.100.0-jammy1 +ARG PSW_VERSION=2.27.100.1-jammy1 +ARG DCAP_VERSION=1.24.100.2-jammy1 RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates libcurl4 wget \ - && wget -Petc https://github.com/intel/confidential-computing.tee.dcap/raw/DCAP_1.23/QuoteGeneration/qcnl/linux/sgx_default_qcnl_azure.conf \ + && wget -Petc https://github.com/intel/confidential-computing.tee.dcap/raw/DCAP_1.24/QuoteGeneration/qcnl/linux/sgx_default_qcnl_azure.conf \ && wget -qO /etc/apt/keyrings/intel-sgx-keyring.asc https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key \ && echo 'deb [signed-by=/etc/apt/keyrings/intel-sgx-keyring.asc arch=amd64] https://download.01.org/intel-sgx/sgx_repo/ubuntu jammy main' > /etc/apt/sources.list.d/intel-sgx.list \ && apt-get update && apt-get install -y --no-install-recommends \ diff --git a/dockerfiles/Dockerfile.build-base b/dockerfiles/Dockerfile.build-base index 65c3670d9..72d596aaa 100644 --- a/dockerfiles/Dockerfile.build-base +++ b/dockerfiles/Dockerfile.build-base @@ -1,4 +1,4 @@ -FROM ubuntu:jammy-20251013 +FROM ubuntu:jammy-20260109 RUN apt-get update && apt-get install -dy --no-install-recommends \ build-essential \ ca-certificates \ diff --git a/dockerfiles/Dockerfile.focal b/dockerfiles/Dockerfile.focal index 7958df315..ba6a896d9 100644 --- a/dockerfiles/Dockerfile.focal +++ b/dockerfiles/Dockerfile.focal @@ -11,7 +11,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ ninja-build \ wget -ARG erttag=v0.5.0 +ARG erttag=v0.5.1 RUN git clone -b $erttag --depth=1 https://github.com/edgelesssys/edgelessrt \ && mkdir build diff --git a/src/meshpremain/go.mod b/src/meshpremain/go.mod index 1e75c7974..71fe8c2b9 100644 --- a/src/meshpremain/go.mod +++ b/src/meshpremain/go.mod @@ -11,7 +11,7 @@ require ( github.com/google/uuid v1.6.0 // indirect github.com/spf13/afero v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect - go.uber.org/zap v1.27.0 // indirect + go.uber.org/zap v1.27.1 // indirect golang.org/x/crypto v0.33.0 // indirect golang.org/x/net v0.35.0 // indirect golang.org/x/sys v0.30.0 // indirect diff --git a/src/meshpremain/go.sum b/src/meshpremain/go.sum index fc8bf3fba..fa5d60c66 100644 --- a/src/meshpremain/go.sum +++ b/src/meshpremain/go.sum @@ -16,8 +16,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= -go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= -go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= +go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc= +go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus= golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M= golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=