Skip to content

Commit

Permalink
Upgrade docker images from 20.04 to 22.04
Browse files Browse the repository at this point in the history
Signed-off-by: g2flyer <[email protected]>
  • Loading branch information
g2flyer committed Jan 25, 2024
1 parent 1204450 commit 6aa5186
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
6 changes: 3 additions & 3 deletions docker/pdo_base.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# ------------------------------------------------------------------------------
ARG UBUNTU_VERSION=20.04
ARG UBUNTU_NAME=focal
ARG UBUNTU_VERSION=22.04
ARG UBUNTU_NAME=jammy

FROM ubuntu:${UBUNTU_VERSION}

Expand Down Expand Up @@ -48,7 +48,7 @@ RUN apt-get update \
ocamlbuild \
pkg-config \
protobuf-compiler \
python \
python3 \
python3-dev \
python3-venv \
python3-virtualenv \
Expand Down
7 changes: 3 additions & 4 deletions docker/pdo_services_base.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
ARG PDO_VERSION
FROM pdo_base:${PDO_VERSION}

ARG UBUNTU_VERSION=20.04
ARG UBUNTU_NAME=focal
ARG UBUNTU_VERSION=22.04
ARG UBUNTU_NAME=jammy

ARG SGX=2.22
ARG OPENSSL=3.0.12
Expand Down Expand Up @@ -59,8 +59,7 @@ ENV SGX_SDK=/opt/intel/sgxsdk
# has 2.30 but Intel ships binary distro for 2.32.51.20190719
# -----------------------------------------------------------------
WORKDIR /opt/intel
RUN [ "$UBUNTU_VERSION" = "20.04" ] \
&& SGX_SDK_BINUTILS_REPO=https://download.01.org/intel-sgx/sgx-linux/${SGX} \
RUN SGX_SDK_BINUTILS_REPO=https://download.01.org/intel-sgx/sgx-linux/${SGX} \
&& SGX_SDK_BINUTILS_FILE=$(wget -P /tmp --delete-after --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 -P /tmp ${SGX_SDK_BINUTILS_REPO}/${SGX_SDK_BINUTILS_FILE} \
&& mkdir sgxsdk.extras \
Expand Down

0 comments on commit 6aa5186

Please sign in to comment.