File tree Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -19,9 +19,9 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive && apt-get install -
19
19
apt-get clean -y --no-install-recommends && \
20
20
apt-get autoclean -y --no-install-recommends
21
21
22
- # # Get and Make CMake version 3.18.0 (latest when Dockerfile developed) - Adjust as necessary
23
- RUN cd /home/ && wget --no-check-certificate https://cmake.org/files/v3.18 /cmake-3.18.0-rc2 .tar.gz && \
24
- tar xvf cmake-3.18.0-rc2 .tar.gz && rm cmake-3.18.0-rc2 .tar.gz && cd /home/cmake-3.18.0-rc2 && \
22
+ # # Get and Make CMake version 3.17.3 (latest GA when Dockerfile developed) - Adjust as necessary
23
+ RUN cd /home/ && wget --no-check-certificate https://cmake.org/files/v3.17 /cmake-3.17.3 .tar.gz && \
24
+ tar xvf cmake-3.17.3 .tar.gz && rm cmake-3.17.3 .tar.gz && cd /home/cmake-3.17.3 && \
25
25
./bootstrap && \
26
26
if [ -n "$makemt" ]; then echo "Making multi-threaded with $makemt jobs" ; make -j$makemt; else echo "Making single-threaded" ; make; fi && \
27
27
make install
@@ -100,7 +100,7 @@ RUN cd /home/nmos-js/Development && \
100
100
# # Move executables, libraries and clean up container as much as possible
101
101
RUN cd /home/nmos-cpp/Development/build && \
102
102
cp nmos-cpp-node nmos-cpp-registry /home && \
103
- cd /home && rm -rf .git conan cmake-3.18.0-rc2 nmos-cpp nmos-js nmos-web-router
103
+ cd /home && rm -rf .git conan cmake-3.17.3 nmos-cpp nmos-js nmos-web-router
104
104
105
105
# # Re-build container for optimised runtime environment using clean Ubuntu Bionic release
106
106
FROM ubuntu:bionic
Original file line number Diff line number Diff line change 1
1
NAME = nmos-cpp
2
2
# grab the abrev commit SHA from Dockerfile
3
- VERSION = 0.1S -$(shell sed -n 's/.* NMOS_CPP_VERSION=\(.......\) .*/\1/p' Dockerfile)
3
+ VERSION = 1.0A -$(shell sed -n 's/.* NMOS_CPP_VERSION=\(.......\) .*/\1/p' Dockerfile)
4
4
# Get number of processors available and add 1
5
5
NPROC = $(shell echo $(shell nproc) +1 | bc)
6
6
You can’t perform that action at this time.
0 commit comments