Skip to content
Snippets Groups Projects
Commit 5901140e authored by Lars Bilke's avatar Lars Bilke
Browse files

[Docker] Use default gcc (7.3) on Ubuntu.

parent 04ae04c9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
scripts/docker/Dockerfile.gcc.full
+ 2
− 8
View file @ 5901140e
...@@ -11,16 +11,10 @@ RUN apt-get update -y && \ ...@@ -11,16 +11,10 @@ RUN apt-get update -y && \
# GNU compiler # GNU compiler
RUN apt-get update -y && \ RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends software-properties-common && \
apt-add-repository ppa:ubuntu-toolchain-r/test -y && \
apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
gcc-6 \ gcc \
g++-6 && \ g++ && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
RUN update-alternatives --install /usr/bin/gcc gcc $(which gcc-6) 30 && \
update-alternatives --install /usr/bin/g++ g++ $(which g++-6) 30 && \
update-alternatives --install /usr/bin/gcov gcov $(which gcov-6) 30
# OGS base building block # OGS base building block
# Python # Python
......
scripts/docker/Dockerfile.gcc.gui
+ 2
− 8
View file @ 5901140e
...@@ -11,16 +11,10 @@ RUN apt-get update -y && \ ...@@ -11,16 +11,10 @@ RUN apt-get update -y && \
# GNU compiler # GNU compiler
RUN apt-get update -y && \ RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends software-properties-common && \
apt-add-repository ppa:ubuntu-toolchain-r/test -y && \
apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
gcc-6 \ gcc \
g++-6 && \ g++ && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
RUN update-alternatives --install /usr/bin/gcc gcc $(which gcc-6) 30 && \
update-alternatives --install /usr/bin/g++ g++ $(which g++-6) 30 && \
update-alternatives --install /usr/bin/gcov gcov $(which gcov-6) 30
# OGS base building block # OGS base building block
# Python # Python
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment