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

Bump base images to ubuntu22.04 #1683

Closed
wants to merge 3 commits into from
Closed

Bump base images to ubuntu22.04 #1683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a576a1e
update release base image to ubuntu22.04
cboh4 Sep 30, 2024
d12ffbb
update localsecret dockerfile to use ubuntu22.04 as base image
cboh4 Sep 30, 2024
f755f6e
update gitpod dockerfile
cboh4 Oct 3, 2024
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
2 changes: 1 addition & 1 deletion .devcontainer/library-scripts/common-debian.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
libkrb5-3 \
libgssapi-krb5-2 \
libicu[0-9][0-9] \
liblttng-ust0 \
liblttng-ust1 \
libstdc++6 \
zlib1g \
locales \
Expand Down
3 changes: 3 additions & 0 deletions cosmwasm/enclaves/shared/crypto/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,6 @@ git = "https://github.com/mesalock-linux/rustls"
rev = "95b5e79dc24b02f3ce424437eb9698509d0baf58"
default-features = false
features = ["dangerous_configuration", "mesalock_sgx"]

[net]
git-fetch-with-cli = true
8 changes: 4 additions & 4 deletions deployment/dockerfiles/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
# `--target build-deb-mainnet` - the image used to generate deb package for mainnet (will pull precompiled enclave)
# `--target compile-secretd` - image with compiled enclave and secretd

ARG SCRT_BASE_IMAGE_ENCLAVE=ghcr.io/scrtlabs/sgx-rust:2004-1.1.6
ARG SCRT_RELEASE_BASE_IMAGE=ghcr.io/scrtlabs/release-base:20.04-2.20-dcap
ARG SCRT_BASE_IMAGE_ENCLAVE=ghcr.io/scrtlabs/sgx-rust:2204-1.1.6
ARG SCRT_RELEASE_BASE_IMAGE=ghcr.io/scrtlabs/release-base:22.04-2.20-dcap

# ***************** PREPARE COMPILE ENCLAVE ************** #

FROM $SCRT_BASE_IMAGE_ENCLAVE AS prepare-compile-enclave

RUN apt-get update && \
apt-get install -y --no-install-recommends \
clang-10 && \
clang-12 && \
rm -rf /var/lib/apt/lists/*

ENV PATH="/root/.cargo/bin:$PATH"
Expand Down Expand Up @@ -152,7 +152,7 @@ RUN . /opt/sgxsdk/environment && env && VERSION=${VERSION} FEATURES=${FEATURES}
FROM $SCRT_RELEASE_BASE_IMAGE as release-image

# wasmi-sgx-test script requirements
RUN add-apt-repository -r "deb https://download.01.org/intel-sgx/sgx_repo/ubuntu focal main" && \
RUN add-apt-repository -r "deb https://download.01.org/intel-sgx/sgx_repo/ubuntu jammy main" && \
apt-get update && \
apt-get install -y --no-install-recommends \
#### Base utilities ####
Expand Down
15 changes: 8 additions & 7 deletions deployment/dockerfiles/base-images/app.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
FROM ubuntu:focal as runtime_base
FROM ubuntu:jammy as runtime_base

LABEL maintainer=enigmampc

# SGX version parameters
ARG SDK_VERSION=2.20
ARG SGX_VERSION=2.20.100.4
ARG PSW_VERSION=2.20.100.4-focal1
ARG OS_REVESION=focal1
ARG DCAP_VERSION=1.17.100.4-focal1
ARG PSW_VERSION=2.20.100.4-jammy1
ARG OS_REVESION=jammy1
ARG DCAP_VERSION=1.17.100.4-jammy1
#RUN apt-get update && \
# apt-get install -y --no-install-recommends \
# #### Base utilities ####
Expand All @@ -32,9 +32,9 @@ RUN mkdir /etc/init && \


RUN apt-get update && \
apt-get install -y gnupg2 apt-transport-https ca-certificates curl software-properties-common make g++ libcurl4 libssl1.1 && \
apt-get install -y gnupg2 apt-transport-https ca-certificates curl software-properties-common make g++ libcurl4 libssl3 && \
curl -fsSL https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | apt-key add - && \
add-apt-repository "deb https://download.01.org/intel-sgx/sgx_repo/ubuntu focal main" && \
add-apt-repository "deb https://download.01.org/intel-sgx/sgx_repo/ubuntu jammy main" && \
apt-get update && \
apt-get install -y \
libsgx-aesm-launch-plugin=$PSW_VERSION \
Expand Down Expand Up @@ -82,7 +82,8 @@ RUN apt-get update && \

#RUN apt-get install libsgx-epid libsgx-quote-ex libsgx-dcap-ql
#
ADD https://download.01.org/intel-sgx/sgx-linux/${SDK_VERSION}/distro/ubuntu20.04-server/sgx_linux_x64_sdk_${SGX_VERSION}.bin ./sgx/
ADD https://download.01.org/intel-sgx/sgx-linux/${SDK_VERSION}/distro/ubuntu22.04-server/sgx_linux_x64_sdk_${SGX_VERSION}.bin ./sgx/
# ADD https://download.01.org/intel-sgx/sgx-linux/${SDK_VERSION}/distro/ubuntu20.04-server/sgx_linux_x64_sdk_${SGX_VERSION}.bin ./sgx/
## ADD https://download.01.org/intel-sgx/sgx-linux/2.9.1/distro/ubuntu18.04-server/sgx_linux_x64_driver_2.6.0_95eaa6f.bin ./sgx/
##
RUN chmod +x ./sgx/sgx_linux_x64_sdk_${SGX_VERSION}.bin
Expand Down
2 changes: 1 addition & 1 deletion deployment/dockerfiles/base-images/gitpod-local.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/scrtlabs/localsecret:v1.9.0-beta.1-random
FROM ghcr.io/scrtlabs/localsecret:v1.14.0

### Install Sudo ###

Expand Down
Loading