Skip to content

Commit 53a3d82

Browse files
author
Michele Adduci
committed
Updated README, removed clang++, since it couldn't be installed on latest stable debian
1 parent d9acaf1 commit 53a3d82

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

Dockerfile

+2-7
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,14 @@ LABEL maintainer="[email protected]"
44

55
WORKDIR /project
66

7-
RUN echo "*** Installing gcc (4.9->8) and clang (3.8->6) ***" \
7+
RUN echo "*** Installing gcc (4.9->8) ***" \
88
&& DEBIAN_FRONTEND=noninteractive apt-get update \
99
&& apt-get dist-upgrade -y \
1010
&& echo "deb http://ftp.us.debian.org/debian jessie main contrib non-free" >> /etc/apt/sources.list.d/jessie.list \
1111
&& echo "deb http://ftp.us.debian.org/debian unstable main contrib non-free" >> /etc/apt/sources.list.d/unstable.list \
1212
&& apt-get update \
1313
&& apt-get install -y cmake \
14-
&& apt-get install -y g++-4.9 g++-5 g++-6 g++-7 g++-8 \
15-
&& apt-get install -y clang++-3.8 \
16-
&& apt-get install -y clang++-3.9 \
17-
&& apt-get install -y clang++-4.0 \
18-
&& apt-get install -y clang++-5.0 \
19-
&& apt-get install -y clang++-6.0 \
14+
&& apt-get install -y g++-4.9 g++-6 g++-7 g++-8 \
2015
&& apt-get autoremove --purge -y \
2116
&& apt-get autoclean -y \
2217
&& rm -rf /var/cache/apt/* /tmp/* \

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2017 Michele Adduci
3+
Copyright (c) 2017-2019 Michele Adduci
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

+6-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Build Status](https://travis-ci.org/madduci/docker-linux-cpp.svg?branch=master)](https://travis-ci.org/madduci/docker-linux-cpp)
44

5-
A basic docker image for C++ developers, featuring g++ (from 4.9 up to 8.x) and clang++ (from 3.8 to 6.0) and CMake support. The default compiler is g++ 8, but you're free to modify the Dockerfile and set your own; as example, if you want to set g++ 4.9 as the default compiler, just write the following Dockerfile and build a new image:
5+
A basic docker image for C++ developers, featuring g++ (from 4.9 up to 8.x) and CMake support. The default compiler is g++ 8, but you're free to modify the Dockerfile and set your own; as example, if you want to set g++ 4.9 as the default compiler, just write the following Dockerfile and build a new image:
66

77
```
88
# Dockerfile
@@ -20,7 +20,11 @@ As default working directory, `/project` is being used, but feel free to change
2020

2121
## Requirements
2222

23-
* Docker (possibly the latest version, 17.06+)
23+
* Docker (possibly the latest version)
24+
25+
## Note
26+
27+
Since the Debian repository are changing rapidly, it wasn't possible to add clang directly, as well as g++ 5, which was removed
2428

2529
## Build/Run instructions
2630

0 commit comments

Comments
 (0)