Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dockerfile fix for 20.04 #463

Merged
merged 2 commits into from
Nov 17, 2020
Merged

Dockerfile fix for 20.04 #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a8e1f8
Docker fixes for 20.04
g2flyer Nov 12, 2020
8f6eaec
Merge branch 'flow-refactoring' into msteiner.ubuntu-20.04
g2flyer Nov 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions utils/docker/base-dev/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ ENV SGXSSL_VERSION=${SGXSSL_VERSION}
WORKDIR /tmp

RUN apt-get update -q \
&& DEBIAN_FRONTEND="noninteractive" \
&& env DEBIAN_FRONTEND="noninteractive" TZ="UTC" \
# above makes sure any install of 'tzdata' or alike (as e.g., pulled in via ubuntu 20.04) does not hang ...
&& apt-get install -y -q \
apt-get install -y -q \
# build tools
build-essential \
clang-format \
Expand All @@ -49,6 +49,7 @@ RUN apt-get update -q \
libssl-dev \
libtool \
pkg-config \
python \
protobuf-compiler \
python-protobuf \
# docker commands (need as we use docker daemon from "outside")
Expand Down
12 changes: 7 additions & 5 deletions utils/docker/base-rt/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ ENV GOPATH=/project

# Get all necessary apt packages
RUN apt-get update -q \
&& DEBIAN_FRONTEND="noninteractive" \
&& env DEBIAN_FRONTEND="noninteractive" TZ="UTC" \
# above makes sure any install of 'tzdata' or alike (as e.g., pulled in via ubuntu 20.04) does not hang ...
apt-get install -y -q\
basez \
Expand All @@ -59,8 +59,8 @@ RUN apt-get update -q \
RUN echo "deb [arch=amd64] https://download.01.org/intel-sgx/sgx_repo/ubuntu ${UBUNTU_NAME} main" >> /etc/apt/sources.list \
&& wget -qO - https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | apt-key add - \
&& apt-get update -q \
&& DEBIAN_FRONTEND="noninteractive" \
&& apt-get install -y -q \
&& env DEBIAN_FRONTEND="noninteractive" TZ="UTC" \
apt-get install -y -q \
# We do not need daemons like AESMD as we run them on host (side-steps also
# issues with config of /etc/aesmd.conf like proxy ..). Without this option
# aesmd and lots of other plugsin are automatically pulled in.
Expand Down Expand Up @@ -113,8 +113,10 @@ ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${SGX_SDK}/sdk_libs
# LVI mitigations, needed to compile sgxssl, requires a
# recent version of binutils (>= 2.32). Ubuntu 18.04 only
# has 2.30 but Intel ships binary distro for 2.32.51.20190719
RUN [ "${UBUNTU_VERSION}" = "18.04" ] \
&& SGX_SDK_BINUTILS_REPO=https://download.01.org/intel-sgx/sgx-linux/${SGX} \
# As sgx ships tools also for 20.04, use these for simplicity
# and uniformity reason
RUN \
SGX_SDK_BINUTILS_REPO=https://download.01.org/intel-sgx/sgx-linux/${SGX} \
&& SGX_SDK_BINUTILS_FILE=$(cd /tmp; wget --spider --recursive --level=1 --no-parent ${SGX_SDK_BINUTILS_REPO} 2>&1 | perl -ne 'if (m|'${SGX_SDK_BINUTILS_REPO}'/(as.ld.objdump.*)|) { print "$1\n"; }') \
&& wget -q ${SGX_SDK_BINUTILS_REPO}/${SGX_SDK_BINUTILS_FILE} \
&& mkdir sgxsdk.extras \
Expand Down