diff --git a/VERSION b/VERSION index 9a48aad90..a9e3e23c8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0.4.6 +v0.4.7 diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index f81b290c2..f8748033f 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/edgelesssys/edgelessrt/build-base:v0.4.6 AS build +FROM ghcr.io/edgelesssys/edgelessrt/build-base:v0.4.7 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.4.6 +ARG erttag=v0.4.7 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-20240808 AS release_deploy +FROM ubuntu:jammy-20240911.1 AS release_deploy LABEL description="Containerized SGX for release" -ARG PSW_VERSION=2.24.100.3-jammy1 -ARG DCAP_VERSION=1.21.100.3-jammy1 +ARG PSW_VERSION=2.25.100.3-jammy1 +ARG DCAP_VERSION=1.22.100.3-jammy1 RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates libcurl4 wget \ - && wget -Petc https://github.com/intel/SGXDataCenterAttestationPrimitives/raw/DCAP_1.21/QuoteGeneration/qcnl/linux/sgx_default_qcnl_azure.conf \ + && wget -Petc https://github.com/intel/SGXDataCenterAttestationPrimitives/raw/DCAP_1.22/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 7c3943bca..a5e1e6cb2 100644 --- a/dockerfiles/Dockerfile.build-base +++ b/dockerfiles/Dockerfile.build-base @@ -1,4 +1,4 @@ -FROM ubuntu:jammy-20240808 +FROM ubuntu:jammy-20240911.1 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 7d540692a..8b3d9531b 100644 --- a/dockerfiles/Dockerfile.build-base-focal +++ b/dockerfiles/Dockerfile.build-base-focal @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20240530 +FROM ubuntu:focal-20241011 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 89315c9d8..e1154a0f8 100644 --- a/dockerfiles/Dockerfile.focal +++ b/dockerfiles/Dockerfile.focal @@ -1,4 +1,4 @@ -FROM ghcr.io/edgelesssys/edgelessrt/build-base-focal:v0.4.6 AS build +FROM ghcr.io/edgelesssys/edgelessrt/build-base-focal:v0.4.7 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 \ @@ -11,7 +11,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ ninja-build \ wget -ARG erttag=v0.4.6 +ARG erttag=v0.4.7 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 2c10edd4b..e68670561 100644 --- a/src/meshpremain/go.mod +++ b/src/meshpremain/go.mod @@ -12,10 +12,10 @@ require ( github.com/spf13/afero v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/crypto v0.27.0 // indirect - golang.org/x/net v0.29.0 // indirect - golang.org/x/sys v0.25.0 // indirect - golang.org/x/text v0.18.0 // indirect + golang.org/x/crypto v0.28.0 // indirect + golang.org/x/net v0.30.0 // indirect + golang.org/x/sys v0.26.0 // indirect + golang.org/x/text v0.19.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988 // indirect google.golang.org/grpc v1.64.1 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/src/meshpremain/go.sum b/src/meshpremain/go.sum index 23d2e31b5..456d66d58 100644 --- a/src/meshpremain/go.sum +++ b/src/meshpremain/go.sum @@ -18,14 +18,14 @@ 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= -golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= -golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= -golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= -golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= -golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= -golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= -golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= +golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= +golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= +golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= +golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= +golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988 h1:V71AcdLZr2p8dC9dbOIMCpqi4EmRl8wUwnJzXXLmbmc= google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.64.1 h1:LKtvyfbX3UGVPFcGqJ9ItpVWW6oN/2XqTxfAnwRRXiA=