Skip to content

Commit

Permalink
bump versions
Browse files Browse the repository at this point in the history
  • Loading branch information
thomasten authored and daniel-weisse committed Feb 27, 2024
1 parent 227ba93 commit ae1d940
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.build-base
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.build-base-focal
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
6 changes: 3 additions & 3 deletions dockerfiles/Dockerfile.cli
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -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 \
Expand Down
8 changes: 4 additions & 4 deletions dockerfiles/Dockerfile.coordinator
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down

0 comments on commit ae1d940

Please sign in to comment.