Skip to content

Commit

Permalink
Update system version to ubuntu-jammy
Browse files Browse the repository at this point in the history
  • Loading branch information
alephpiece committed Apr 5, 2024
1 parent 5c05bb7 commit ec67d09
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ARG SPACK_VERSION="0.21.2"
ARG SPACK_IMAGE="spack/ubuntu-focal"
ARG SPACK_IMAGE="spack/ubuntu-jammy"
FROM ${SPACK_IMAGE}:${SPACK_VERSION} AS builder
ARG UBUNTU_CODE
ENV UBUNTU_CODE=${UBUNTU_CODE:-"focal"}
ENV UBUNTU_CODE=${UBUNTU_CODE:-"jammy"}

LABEL maintainer="An Wang <wangan.cs@gmail.com>"

Expand All @@ -19,7 +19,7 @@ ARG AMDGPU_VERSION=5.3
# install LLVM and CMake for spack, and
# install ROCm HIP, see https://github.com/ROCm/ROCm-docker/blob/master/dev/Dockerfile-ubuntu-20.04
COPY etc/apt/ /etc/apt/
RUN sed -i -e "s/focal/$UBUNTU_CODE/g" /etc/apt/sources.list \
RUN sed -i -e "s/jammy/$UBUNTU_CODE/g" /etc/apt/sources.list \
&& apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ca-certificates curl libnuma-dev gnupg \
&& curl -sL https://repo.radeon.com/rocm/rocm.gpg.key | apt-key add - \
Expand All @@ -35,7 +35,7 @@ RUN sed -i -e "s/focal/$UBUNTU_CODE/g" /etc/apt/sources.list \
python3-pip \
rocm-dev \
build-essential \
llvm-10 clang-10 libomp-10-dev cmake openssh-server && \
llvm-15 clang-15 libomp-15-dev cmake openssh-server && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#===============================================================================

# Build-time arguments
UBUNTU_CODE ?= "focal"
UBUNTU_CODE ?= "jammy"
SPACK_VERSION ?= "0.21.2"
SPACK_IMAGE = "spack/ubuntu-$(UBUNTU_CODE)"

Expand Down
4 changes: 3 additions & 1 deletion scripts/setup-mirror.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
#!/usr/bin/env bash

# Please make sure you are in the root directory of this git repo
set -e
MIRROR_DIR=$(pwd)/mirror
[ -d $MIRROR_DIR ] || mkdir $MIRROR_DIR

# Add a self-hosted repo
spack repo add repo/

# Copied from Dockerfile
GCC_SPEC="gcc"
CLANG_SPEC="clang"
Expand Down

0 comments on commit ec67d09

Please sign in to comment.