Skip to content

Commit ae1d940

Browse files
thomastendaniel-weisse
authored andcommitted
bump versions
1 parent 227ba93 commit ae1d940

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.11)
22

3-
project(marblerun VERSION 1.4.0)
3+
project(marblerun VERSION 1.4.1)
44
find_package(OpenEnclave CONFIG REQUIRED)
55

66
if (NOT CMAKE_BUILD_TYPE)

dockerfiles/Dockerfile.build-base

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:jammy-20231128
1+
FROM ubuntu:jammy-20240212
22
RUN apt-get update && apt-get install -dy --no-install-recommends \
33
build-essential \
44
ca-certificates \

dockerfiles/Dockerfile.build-base-focal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ RUN wget \
44
https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage \
55
https://github.com/AppImage/type2-runtime/releases/download/continuous/runtime-x86_64
66

7-
FROM ubuntu:focal-20231128
7+
FROM ubuntu:focal-20240123
88
COPY --from=download /intel-sgx-deb.key /etc/apt/keyrings/intel-sgx-keyring.asc
99
COPY --from=download /*-x86_64* /
1010
RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates \

dockerfiles/Dockerfile.cli

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/edgelesssys/marblerun/build-base-focal:v1.4.0 AS build
1+
FROM ghcr.io/edgelesssys/marblerun/build-base-focal:v1.4.1 AS build
22

33
# don't run `apt-get update` because required packages are cached in build-base for reproducibility
44
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 \
1212
ninja-build \
1313
wget
1414

15-
ARG erttag=v0.4.1
16-
ARG mrtag=v1.4.0
15+
ARG erttag=v0.4.2
16+
ARG mrtag=v1.4.1
1717
ARG goversion=1.20.6
1818
RUN wget -qO- https://go.dev/dl/go${goversion}.linux-amd64.tar.gz | tar -C /usr/local -xz \
1919
&& git clone -b $erttag --depth=1 https://github.com/edgelesssys/edgelessrt \

dockerfiles/Dockerfile.coordinator

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/edgelesssys/marblerun/build-base:v1.4.0 AS build
1+
FROM ghcr.io/edgelesssys/marblerun/build-base:v1.4.1 AS build
22

33
# don't run `apt-get update` because required packages are cached in build-base for reproducibility
44
RUN apt-get install -y --no-install-recommends \
@@ -11,8 +11,8 @@ RUN apt-get install -y --no-install-recommends \
1111
ninja-build \
1212
wget
1313

14-
ARG erttag=v0.4.1
15-
ARG mrtag=v1.4.0
14+
ARG erttag=v0.4.2
15+
ARG mrtag=v1.4.1
1616
ARG goversion=1.20.6
1717
RUN wget -qO- https://go.dev/dl/go${goversion}.linux-amd64.tar.gz | tar -C /usr/local -xz \
1818
&& git clone -b $erttag --depth=1 https://github.com/edgelesssys/edgelessrt \
@@ -43,7 +43,7 @@ COPY --from=build \
4343
COPY --from=build /mrbuild/marblerun /marblerun-ubuntu-22.04
4444

4545
# the coordinator container image
46-
FROM ubuntu:jammy-20231128 AS release
46+
FROM ubuntu:jammy-20240212 AS release
4747
ARG PSW_VERSION=2.22.100.3-jammy1
4848
ARG DCAP_VERSION=1.19.100.3-jammy1
4949
RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates libcurl4 wget \

0 commit comments

Comments
 (0)