Skip to content

Commit d37a2b7

Browse files
author
Richard Hastie
committed
Revert to GA CMake 3.17.3 from RC CMake 3.18.0-rc2 and update Makefile to Release 1.0A from Dev
1 parent 59a8b85 commit d37a2b7

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive && apt-get install -
1919
apt-get clean -y --no-install-recommends && \
2020
apt-get autoclean -y --no-install-recommends
2121

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 && \
2525
./bootstrap && \
2626
if [ -n "$makemt" ]; then echo "Making multi-threaded with $makemt jobs"; make -j$makemt; else echo "Making single-threaded"; make; fi && \
2727
make install
@@ -100,7 +100,7 @@ RUN cd /home/nmos-js/Development && \
100100
## Move executables, libraries and clean up container as much as possible
101101
RUN cd /home/nmos-cpp/Development/build && \
102102
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
104104

105105
## Re-build container for optimised runtime environment using clean Ubuntu Bionic release
106106
FROM ubuntu:bionic

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
NAME = nmos-cpp
22
# 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)
44
# Get number of processors available and add 1
55
NPROC = $(shell echo $(shell nproc)+1 | bc)
66

0 commit comments

Comments
 (0)