Skip to content

Commit

Permalink
prepare release
Browse files Browse the repository at this point in the history
  • Loading branch information
thomasten committed Jul 19, 2022
1 parent 792ff89 commit f125531
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 11 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.11)
project(ego VERSION 0.5.1)
project(ego VERSION 1.0.0)

if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Debug)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ You can reproducibly build the latest release:
cd dockerfiles
DOCKER_BUILDKIT=1 docker build -o. - < Dockerfile.build
```
Or the latest master:
Or build the latest master:
```sh
cd dockerfiles
DOCKER_BUILDKIT=1 docker build --build-arg egotag=master --build-arg erttag=master -o. - < Dockerfile.build
Expand Down
16 changes: 7 additions & 9 deletions dockerfiles/Dockerfile.build
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
FROM ubuntu:focal-20220531 AS build
FROM ghcr.io/edgelesssys/ego/build-base:v1.0.0 AS build

RUN apt update && DEBIAN_FRONTEND=noninteractive apt install -y \
# 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 \
build-essential \
ca-certificates \
clang-10 \
cmake \
doxygen \
git \
libssl-dev \
locales \
ninja-build \
wget \
&& locale-gen en_US.UTF-8
ENV LANG=en_US.UTF-8
wget

ARG erttag=v0.3.3
ARG egotag=v0.5.1
ARG erttag=v0.3.4
ARG egotag=v1.0.0
RUN wget -qO- https://golang.org/dl/go1.18.1.linux-amd64.tar.gz | tar -C /usr/local -xz \
&& git clone -b $erttag --depth=1 https://github.com/edgelesssys/edgelessrt \
&& git clone -b $egotag --depth=1 https://github.com/edgelesssys/ego \
Expand Down
10 changes: 10 additions & 0 deletions dockerfiles/Dockerfile.build-base
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
FROM ubuntu:focal-20220531
RUN apt-get update && apt-get install -dy --no-install-recommends \
build-essential \
ca-certificates \
clang-10 \
cmake \
git \
libssl-dev \
ninja-build \
wget

0 comments on commit f125531

Please sign in to comment.