X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=bldr-imgs%2Fbldr-ubuntu18-c-go%2FDockerfile;h=7af4e9d8a54285168b183be783dc234dc7d2fd88;hb=873846987e07978e790f264341c58699c5c8dfb0;hp=6742e97e9bb0e8a021b5674098d4a10d7e7f19c8;hpb=7ba8cd1c09cd59ece9925d21b87f7d64f2272ad8;p=it%2Fdev.git diff --git a/bldr-imgs/bldr-ubuntu18-c-go/Dockerfile b/bldr-imgs/bldr-ubuntu18-c-go/Dockerfile index 6742e97..7af4e9d 100644 --- a/bldr-imgs/bldr-ubuntu18-c-go/Dockerfile +++ b/bldr-imgs/bldr-ubuntu18-c-go/Dockerfile @@ -84,13 +84,6 @@ RUN wget -nv https://github.com/Kitware/CMake/releases/download/v${cv}/cmake-${c && ./cmake-${cv}-Linux-x86_64.sh --prefix=/usr/local --skip-license \ && rm -f cmake*.sh -# install a recent version of ninja-build, ubuntu repo version is old -RUN wget -nv https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-linux.zip \ - && unzip ninja-linux.zip \ - && chmod +x ninja \ - && mv ninja /usr/local/bin \ - && rm -f ninja*.zip - # sonar-scanner is not available in ubuntu repo ARG sv="4.2.0.1873" RUN wget -nv https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${sv}-linux.zip \ @@ -102,20 +95,6 @@ RUN wget -nv https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/son RUN wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $GOPATH/bin v1.23.6 \ && rm -f install.sh -# NNG repo is not frequently tagged so it's pinned to a commit hash. -# This commit provides fix to the proxy-reconnect -# bug that we identified: https://github.com/nanomsg/nng/issues/970 -RUN git clone https://github.com/nanomsg/nng.git \ - && cd nng \ - && git checkout e618abf8f3db2a94269a79c8901a51148d48fcc2 \ - && mkdir build \ - && cd build \ - && cmake -DBUILD_SHARED_LIBS=1 -G Ninja .. \ - && ninja \ - && ninja install \ - && cd ../.. \ - && rm -rf nng - # install a recent version of boost, ubuntu repo version is old ARG bv="1_69_0" RUN wget -nv https://dl.bintray.com/boostorg/release/1.69.0/source/boost_${bv}.zip \