diff --git a/VERSION b/VERSION index f87d474c4..79b0815e6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0.4.3 +v0.4.4 diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index 563b52898..50b0efcce 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/edgelesssys/edgelessrt/build-base:v0.4.3 AS build +FROM ghcr.io/edgelesssys/edgelessrt/build-base:v0.4.4 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.3 +ARG erttag=v0.4.4 RUN git clone -b $erttag --depth=1 https://github.com/edgelesssys/edgelessrt \ && mkdir build @@ -26,11 +26,11 @@ FROM scratch AS export COPY --from=build /build/edgelessrt_*_amd64_ubuntu-22.04.deb / -FROM ubuntu:jammy-20240227 AS release_deploy +FROM ubuntu:jammy-20240427 AS release_deploy LABEL description="Containerized SGX for release" -ARG PSW_VERSION=2.22.100.3-jammy1 -ARG DCAP_VERSION=1.19.100.3-jammy1 +ARG PSW_VERSION=2.24.100.3-jammy1 +ARG DCAP_VERSION=1.21.100.3-jammy1 RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates libcurl4 wget \ && 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 \ diff --git a/dockerfiles/Dockerfile.build-base b/dockerfiles/Dockerfile.build-base index 0977745de..c27d8a4e7 100644 --- a/dockerfiles/Dockerfile.build-base +++ b/dockerfiles/Dockerfile.build-base @@ -1,4 +1,4 @@ -FROM ubuntu:jammy-20240227 +FROM ubuntu:jammy-20240427 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 f70667b88..e192939f2 100644 --- a/dockerfiles/Dockerfile.build-base-focal +++ b/dockerfiles/Dockerfile.build-base-focal @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20240216 +FROM ubuntu:focal-20240427 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 6989e4621..e3bc616fa 100644 --- a/dockerfiles/Dockerfile.focal +++ b/dockerfiles/Dockerfile.focal @@ -1,4 +1,4 @@ -FROM ghcr.io/edgelesssys/edgelessrt/build-base-focal:v0.4.3 AS build +FROM ghcr.io/edgelesssys/edgelessrt/build-base-focal:v0.4.4 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.3 +ARG erttag=v0.4.4 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 c1cc1bed9..6118a1ae0 100644 --- a/src/meshpremain/go.mod +++ b/src/meshpremain/go.mod @@ -5,20 +5,19 @@ go 1.20 require github.com/edgelesssys/marblerun v1.4.1 require ( - github.com/edgelesssys/ego v1.4.4 // indirect + github.com/edgelesssys/ego v1.5.2 // indirect github.com/edgelesssys/era v0.3.3 // indirect - github.com/golang/protobuf v1.5.4 // indirect github.com/google/go-cmp v0.6.0 // indirect 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 - golang.org/x/crypto v0.21.0 // indirect - golang.org/x/net v0.22.0 // indirect - golang.org/x/sys v0.18.0 // indirect - golang.org/x/text v0.14.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240308144416-29370a3891b7 // indirect - google.golang.org/grpc v1.62.1 // indirect - google.golang.org/protobuf v1.33.0 // indirect + golang.org/x/crypto v0.24.0 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect + google.golang.org/grpc v1.64.0 // indirect + google.golang.org/protobuf v1.34.1 // indirect gopkg.in/square/go-jose.v2 v2.6.0 // indirect ) diff --git a/src/meshpremain/go.sum b/src/meshpremain/go.sum index 402de6ac1..092a6c2a6 100644 --- a/src/meshpremain/go.sum +++ b/src/meshpremain/go.sum @@ -1,12 +1,10 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= -github.com/edgelesssys/ego v1.4.4 h1:wkTPrwD3HXO/3/5//WoTCyNtuNlnUQtkWxlJmPN6kFg= -github.com/edgelesssys/ego v1.4.4/go.mod h1:960g6SKJMJAtvVFLDuOz8jJscoz23t0iJImKjfHWi94= +github.com/edgelesssys/ego v1.5.2 h1:DC8H073Z49rGT/0aom1yGOHDVtv2PnTX/9HZlB0Fdv8= +github.com/edgelesssys/ego v1.5.2/go.mod h1:TLwP4eAy38XUWuV2E71OYX18RAv4ZJpaLEWQFS751t0= github.com/edgelesssys/era v0.3.3 h1:EyZvkR/WJceMaV+15lt+CYI0h6mC8pUOFklbbKT8KwQ= github.com/edgelesssys/era v0.3.3/go.mod h1:yGYrnt8vxxFUsbMQCMwEBItNK9vNqS0f9YONvr78lBY= github.com/edgelesssys/marblerun v1.4.1 h1:k/v1vWuRaynEJtajYVjLKtK0EGpOVxNhd2AvI/63axs= github.com/edgelesssys/marblerun v1.4.1/go.mod h1:q+EjAV3OUTHObBpUp7tI774uZCDgVdDEf1vYGi8aXYA= -github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= -github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= @@ -20,20 +18,20 @@ 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.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= -golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= -golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= -golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240308144416-29370a3891b7 h1:em/y72n4XlYRtayY/cVj6pnVzHa//BDA1BdoO+z9mdE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240308144416-29370a3891b7/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs= -google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= -google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= -google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= -google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= +golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 h1:1GBuWVLM/KMVUv1t1En5Gs+gFZCNd360GGb4sSxtrhU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= +google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= +google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI= gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=