MirrorHub
/
construct
mirror of https://github.com/matrix-construct/construct
0
0
Fork 0
Code Issues Releases Wiki Activity

Add gcc-9 base

This commit is contained in:
Wessel Nieboer 2020-04-08 03:58:55 +02:00
parent a1858b9f89
commit dddca1b1eb
3 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/docker/build-and-push-images.sh
View File

@ -1,9 +1,12 @@
#!/bin/sh
# Please run from the directory this file in
docker pull ubuntu:18.04
docker build -t jevolk/construct:ubuntu-18.04 ./ubuntu/base
docker build -t jevolk/construct:ubuntu-18.04-clang-9 ./ubuntu/clang-9
docker build -t jevolk/construct:ubuntu-18.04-gcc-8 ./ubuntu/gcc-8
BASEDIR=$(dirname "$0")
docker push jevolk/construct:ubuntu-18.04-clang-9
docker push jevolk/construct:ubuntu-18.04-gcc-8
docker pull ubuntu:18.04
docker build -t jevolk/construct:ubuntu-18.04 $BASEDIR/ubuntu/base
docker build -t jevolk/construct:ubuntu-18.04-clang-9 $BASEDIR/ubuntu/clang-9
docker build -t jevolk/construct:ubuntu-18.04-gcc-8 $BASEDIR/ubuntu/gcc-8
docker build -t jevolk/construct:ubuntu-18.04-gcc-9 $BASEDIR/ubuntu/gcc-9
#docker push jevolk/construct:ubuntu-18.04-clang-9
#docker push jevolk/construct:ubuntu-18.04-gcc-8
#docker push jevolk/construct:ubuntu-18.04-gcc-9

2
tools/docker/ubuntu/base/Dockerfile
View File

@ -1,5 +1,7 @@
FROM ubuntu:18.04
ENV DEBIAN_FRONTEND=noninteractive
RUN \
apt-get update && \
apt-get install --no-install-recommends -y software-properties-common && \

12
tools/docker/ubuntu/gcc-9/Dockerfile Normal file
View File

@ -0,0 +1,12 @@
FROM jevolk/construct:ubuntu-18.04
ENV CXX g++-9
ENV CC gcc-9
RUN apt-get update \
&& apt-get install --no-install-recommends -y software-properties-common \
&& add-apt-repository ppa:jonathonf/gcc-9.2 \
&& apt-get update \
&& apt-get install --no-install-recommends -y g++- gcc-9 \
&& apt-get clean -y \
&& rm -rf /var/lib/apt/lists/*