Skip to content

Commit 9fa3665

Browse files
oberstetoberstet
committed
sync
1 parent 2b25f1b commit 9fa3665

3 files changed

Lines changed: 41 additions & 31 deletions

File tree

‎Makefile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ build: build_gcc build_clang
1212

1313
build_gcc:
1414
time docker build \
15+
--no-cache \
1516
--build-arg BUILD_DATE=${BUILD_DATE} \
1617
--build-arg AUTOBAHN_CPP_VCS_REF=${AUTOBAHN_CPP_VCS_REF} \
1718
--build-arg AUTOBAHN_CPP_VERSION=${AUTOBAHN_CPP_VERSION} \
@@ -22,6 +23,7 @@ build_gcc:
2223

2324
build_clang:
2425
time docker build \
26+
--no-cache \
2527
--build-arg BUILD_DATE=${BUILD_DATE} \
2628
--build-arg AUTOBAHN_CPP_VCS_REF=${AUTOBAHN_CPP_VCS_REF} \
2729
--build-arg AUTOBAHN_CPP_VERSION=${AUTOBAHN_CPP_VERSION} \
@@ -47,3 +49,7 @@ list:
4749

4850
clean:
4951
./docker/removeall.sh
52+
53+
54+
crossbar:
55+
crossbar start

‎docker/Dockerfile.clang‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ ENV WSPP_ENABLE_CPP11 1
3636
RUN apt-get update \
3737
&& apt-get install -y wget curl unzip git-core \
3838
clang libc++1 libc++-dev libc++abi-dev \
39-
build-essential autotools-dev autoconf libtool \
39+
build-essential autotools-dev autoconf libtool cmake \
4040
zlib1g-dev libbz2-dev libssl-dev \
41+
libboost-all-dev \
4142
&& rm -rf /var/lib/apt/lists/* \
4243
&& apt-get clean
4344

@@ -50,19 +51,19 @@ RUN update-alternatives --install /usr/bin/cc cc /usr/bin/clang 100 \
5051
&& update-alternatives --query cc
5152

5253
# get, build and install Boost from upstream
53-
#RUN cd /tmp \
54-
# && wget http://downloads.sourceforge.net/project/boost/boost/1.66.0/boost_1_66_0.tar.bz2
55-
COPY boost_1_66_0.tar.bz2 /tmp
54+
# RUN cd /tmp \
55+
# && wget https://dl.bintray.com/boostorg/release/1.69.0/source/boost_1_69_0.tar.bz2 \
56+
# && tar xvjf boost_1_69_0.tar.bz2
5657

57-
RUN cd /tmp \
58-
&& tar xvjf boost_1_66_0.tar.bz2 && cd boost_1_66_0 \
59-
&& ./bootstrap.sh --with-toolset=clang \
60-
&& ./b2 toolset=clang cxxflags="-stdlib=libc++" linkflags="-stdlib=libc++" link=shared link=static threading=single threading=multi --layout=tagged --without-python -j 8 install \
61-
&& cd / && rm -rf /tmp/boost*
58+
# RUN cd /tmp/boost_1_69_0 \
59+
# && ./bootstrap.sh --with-toolset=clang \
60+
# && ./b2 toolset=clang cxxflags="-stdlib=libc++" linkflags="-stdlib=libc++" link=shared link=static threading=single threading=multi --layout=tagged --without-python -j 8 install \
61+
# && cd / \
62+
# && rm -rf /tmp/boost*
6263

6364
# https://askubuntu.com/a/486184
64-
RUN cd /usr/local/lib && \
65-
ln -s libboost_thread-mt.a libboost_thread.a
65+
# RUN cd /usr/local/lib && \
66+
# ln -s libboost_thread-mt.a libboost_thread.a
6667

6768
# get, build and install msgpack-c from upstream
6869
RUN cd /tmp \
@@ -80,10 +81,10 @@ RUN cd /tmp \
8081
&& cd / && rm -rf /tmp/websocketpp*
8182

8283
# get and install cmake from upstream
83-
RUN cd /tmp \
84-
&& wget https://cmake.org/files/v3.11/cmake-3.11.0-Linux-x86_64.sh \
85-
&& sh cmake-3.11.0-Linux-x86_64.sh --skip-license --prefix=/usr/local \
86-
&& which cmake && cmake --version
84+
# RUN cd /tmp \
85+
# && wget https://cmake.org/files/v3.11/cmake-3.11.0-Linux-x86_64.sh \
86+
# && sh cmake-3.11.0-Linux-x86_64.sh --skip-license --prefix=/usr/local \
87+
# && which cmake && cmake --version
8788

8889
#### all dependencies and tools are now in place
8990

@@ -96,7 +97,9 @@ WORKDIR /autobahn
9697
COPY autobahn /autobahn/autobahn
9798
COPY examples /autobahn/examples
9899
COPY cmake /autobahn/cmake
99-
COPY CMakeLists.txt /autobahn/
100+
COPY cmake/Modules /autobahn/cmake/Modules
101+
COPY cmake/Includes /autobahn/cmake/Includes
102+
COPY CMakeLists.txt /autobahn/CMakeLists.txt
100103

101104
RUN cd build \
102105
&& cmake .. \

‎docker/Dockerfile.gcc‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,25 +35,26 @@ ENV WSPP_ENABLE_CPP11 1
3535
# update system, get dev tools and libs
3636
RUN apt-get update \
3737
&& apt-get install -y wget curl unzip git-core \
38-
build-essential autotools-dev autoconf libtool \
38+
build-essential autotools-dev autoconf libtool cmake \
3939
zlib1g-dev libbz2-dev libssl-dev \
40+
libboost-all-dev \
4041
&& rm -rf /var/lib/apt/lists/* \
4142
&& apt-get clean
4243

4344
# get, build and install Boost from upstream
44-
#RUN cd /tmp \
45-
# && wget http://downloads.sourceforge.net/project/boost/boost/1.66.0/boost_1_66_0.tar.bz2 \
46-
COPY boost_1_66_0.tar.bz2 /tmp
45+
# RUN cd /tmp \
46+
# && wget https://dl.bintray.com/boostorg/release/1.69.0/source/boost_1_69_0.tar.bz2 \
47+
# && tar xvjf boost_1_69_0.tar.bz2
4748

48-
RUN cd /tmp \
49-
&& tar xvjf boost_1_66_0.tar.bz2 && cd boost_1_66_0 \
50-
&& ./bootstrap.sh --with-toolset=gcc \
51-
&& ./b2 toolset=gcc link=shared link=static threading=single threading=multi --layout=tagged --without-python -j 8 install \
52-
&& cd / && rm -rf /tmp/boost*
49+
# RUN cd /tmp/boost_1_69_0 \
50+
# && ./bootstrap.sh --with-toolset=gcc \
51+
# && ./b2 toolset=gcc link=shared link=static threading=single threading=multi --layout=tagged --without-python -j 8 install \
52+
# && cd / \
53+
# && rm -rf /tmp/boost*
5354

5455
# https://askubuntu.com/a/486184
55-
RUN cd /usr/local/lib && \
56-
ln -s libboost_thread-mt.a libboost_thread.a
56+
# RUN cd /usr/local/lib && \
57+
# ln -s libboost_thread-mt.a libboost_thread.a
5758

5859
# get, build and install msgpack-c from upstream
5960
RUN cd /tmp \
@@ -71,10 +72,10 @@ RUN cd /tmp \
7172
&& cd / && rm -rf /tmp/websocketpp*
7273

7374
# get and install cmake from upstream
74-
RUN cd /tmp \
75-
&& wget https://cmake.org/files/v3.11/cmake-3.11.0-Linux-x86_64.sh \
76-
&& sh cmake-3.11.0-Linux-x86_64.sh --skip-license --prefix=/usr/local \
77-
&& which cmake && cmake --version
75+
# RUN cd /tmp \
76+
# && wget https://cmake.org/files/v3.11/cmake-3.11.0-Linux-x86_64.sh \
77+
# && sh cmake-3.11.0-Linux-x86_64.sh --skip-license --prefix=/usr/local \
78+
# && which cmake && cmake --version
7879

7980
#### all dependencies and tools are now in place
8081

0 commit comments

Comments
 (0)