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

Upgrade docker images from 20.04 to 22.04 #465

Merged
merged 2 commits into from
Jan 31, 2024
Merged

Upgrade docker images from 20.04 to 22.04 #465

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
ea61570
Upgrade docker images from 20.04 to 22.04
g2flyer Jan 25, 2024
07a78f1
Removal of docker ARG duplicates
g2flyer Jan 30, 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
6 changes: 3 additions & 3 deletions docker/pdo_base.dockerfile
View file
Open in desktop
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
4 changes: 1 addition & 3 deletions docker/pdo_client.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ARG UNAME=pdo_client
ENV UNAME=${UNAME}

ARG UID=1000
ARG GID=$UID
ARG GID=${UID}

RUN groupadd -f -g $GID -o $UNAME
RUN useradd -m -u $UID -g $GID -d /project/pdo -o -s /bin/bash $UNAME
Expand Down Expand Up @@ -68,8 +68,6 @@ WORKDIR /project/pdo/tools
COPY --chown=${UNAME}:${UNAME} tools/*.sh ./

# build it!!!
ARG UID=1000
ARG GID=${UID}
RUN --mount=type=cache,uid=${UID},gid=${GID},target=/project/pdo/.cache/pip \
/project/pdo/tools/build_client.sh

Expand Down
7 changes: 3 additions & 4 deletions docker/pdo_services_base.dockerfile
View file
Open in desktop
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} \
cmickeyb marked this conversation as resolved.
Show resolved Hide resolved
&& 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
Loading