Docker update

This commit is contained in:
Blaise Tine 2024-07-23 15:23:46 -07:00
parent 8df962d6b4
commit aec73aa758
2 changed files with 12 additions and 17 deletions

View file

@ -16,15 +16,12 @@
set -e
sudo apt-get update -y
apt-get update -y
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
sudo apt-get update
sudo apt-get install -y g++-11 gcc-11
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 100
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100
add-apt-repository -y ppa:ubuntu-toolchain-r/test
apt-get update
apt-get install -y g++-11 gcc-11
update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 100
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100
sudo apt-get install -y build-essential valgrind libstdc++6 binutils python uuid-dev ccache
sudo apt-get upgrade -y
sudo apt-get update -y
apt-get install -y build-essential valgrind libstdc++6 binutils python uuid-dev ccache

View file

@ -17,15 +17,11 @@ FROM ubuntu:20.04
# Set non-interactive installation to avoid user input during build
ARG DEBIAN_FRONTEND=noninteractive
# Update and install basic and necessary dependencies
# Update and install necessary dependencies
RUN apt-get update && apt-get install -y \
build-essential \
binutils \
python \
python3 \
uuid-dev \
gcc-10 \
g++-10 \
git \
wget \
curl \
@ -41,9 +37,11 @@ RUN git clone --depth=1 --recursive https://github.com/vortexgpgpu/vortex.git /v
# Set the initial working directory
WORKDIR /vortex
# install system dependencies
RUN ./ci/system_updates.sh
# Configure the build folder
RUN mkdir build && cd build && \
../configure --tooldir=$HOME/tools
RUN mkdir build && cd build && ../configure
# Install prebuilt toolchain
RUN cd build && ./ci/toolchain_install.sh --all