izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use update-alternatives for gcc-10 and g++-10

Browse Source
This commit is contained in:
ReenigneArcher
2021-12-20 23:23:26 -05:00
parent cc4ec1b526
commit 8f78b599ae
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/Dockerfile-ubuntu_18_04
+3 -4
View File
@@ -22,9 +22,9 @@ RUN apt-get update -y && \
build-essential \ build-essential \
cmake \ cmake \
ffmpeg \ ffmpeg \
gcc-9 \ gcc-10 \
git \ git \
g++-9 \ g++-10 \
libavdevice-dev \ libavdevice-dev \
libboost-filesystem-dev \ libboost-filesystem-dev \
libboost-log-dev \ libboost-log-dev \
@@ -36,7 +36,6 @@ RUN apt-get update -y && \
libpulse-dev \ libpulse-dev \
libopus-dev \ libopus-dev \
libssl-dev \ libssl-dev \
libstdc++-9 \
libwayland-dev \ libwayland-dev \
libx11-dev \ libx11-dev \
libxcb-shm0-dev \ libxcb-shm0-dev \
@@ -48,7 +47,7 @@ RUN apt-get update -y && \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN cp /usr/bin/gcc-9 /usr/bin/gcc && cp /usr/bin/g++-9 /usr/bin/gcc-9 RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10
RUN wget https://developer.download.nvidia.com/compute/cuda/11.4.2/local_installers/cuda_11.4.2_470.57.02_linux.run --progress=bar:force:noscroll -q --show-progress -O /root/cuda.run && chmod a+x /root/cuda.run RUN wget https://developer.download.nvidia.com/compute/cuda/11.4.2/local_installers/cuda_11.4.2_470.57.02_linux.run --progress=bar:force:noscroll -q --show-progress -O /root/cuda.run && chmod a+x /root/cuda.run
RUN /root/cuda.run --silent --toolkit --toolkitpath=/usr --no-opengl-libs --no-man-page --no-drm && rm /root/cuda.run RUN /root/cuda.run --silent --toolkit --toolkitpath=/usr --no-opengl-libs --no-man-page --no-drm && rm /root/cuda.run
scripts/Dockerfile-ubuntu_20_04
+2 -1
View File
@@ -31,7 +31,8 @@ RUN apt-get update -y && \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN cp /usr/bin/gcc-10 /usr/bin/gcc && cp /usr/bin/g++-10 /usr/bin/gcc-10 # RUN cp /usr/bin/gcc-10 /usr/bin/gcc && cp /usr/bin/g++-10 /usr/bin/gcc-10
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10
RUN wget https://developer.download.nvidia.com/compute/cuda/11.4.2/local_installers/cuda_11.4.2_470.57.02_linux.run --progress=bar:force:noscroll -q --show-progress -O /root/cuda.run && chmod a+x /root/cuda.run RUN wget https://developer.download.nvidia.com/compute/cuda/11.4.2/local_installers/cuda_11.4.2_470.57.02_linux.run --progress=bar:force:noscroll -q --show-progress -O /root/cuda.run && chmod a+x /root/cuda.run
RUN /root/cuda.run --silent --toolkit --toolkitpath=/usr --no-opengl-libs --no-man-page --no-drm && rm /root/cuda.run RUN /root/cuda.run --silent --toolkit --toolkitpath=/usr --no-opengl-libs --no-man-page --no-drm && rm /root/cuda.run