From a852e2a1024ce68e3012f5cbb1f177f1f5ccd13e Mon Sep 17 00:00:00 2001 From: yakiratz Date: Thu, 21 Nov 2019 09:39:36 +0200 Subject: [PATCH] adding go-acc and sonar Change-Id: I7560bf22244e2239cced6540d9cb20ab2357f1dd Signed-off-by: yakiratz --- docker/bldr-ubuntu16-c-go/Dockerfile | 7 +++++++ docker/bldr-ubuntu16-c-go/container-tag.yaml | 2 +- docker/bldr-ubuntu18-c-go/Dockerfile | 7 +++++++ docker/bldr-ubuntu18-c-go/container-tag.yaml | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/docker/bldr-ubuntu16-c-go/Dockerfile b/docker/bldr-ubuntu16-c-go/Dockerfile index 60007c4c..ef75705a 100644 --- a/docker/bldr-ubuntu16-c-go/Dockerfile +++ b/docker/bldr-ubuntu16-c-go/Dockerfile @@ -51,6 +51,13 @@ RUN wget -nv https://github.com/Kitware/CMake/releases/download/v3.14.5/cmake-3. RUN wget -nv https://dl.google.com/go/go1.12.linux-amd64.tar.gz \ && tar -xf go1.12.linux-amd64.tar.gz \ && mv go /usr/local +ENV PATH=$PATH:/usr/local/go/bin:/usr/lib/go-1.12/bin +RUN go get -u github.com/ory/go-acc \ + && mv ~/go/bin/go-acc /usr/local/go/bin + +RUN wget -nv https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-3.2.0.1227-linux.zip \ + && unzip sonar-scanner-cli-3.2.0.1227-linux.zip \ + && mv sonar-scanner-3.2.0.1227-linux /usr/local/ RUN wget -nv https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-linux.zip \ && unzip ninja-linux.zip \ diff --git a/docker/bldr-ubuntu16-c-go/container-tag.yaml b/docker/bldr-ubuntu16-c-go/container-tag.yaml index 0723c4ae..265facb3 100644 --- a/docker/bldr-ubuntu16-c-go/container-tag.yaml +++ b/docker/bldr-ubuntu16-c-go/container-tag.yaml @@ -1,4 +1,4 @@ # Not feasible to show all the software versions # here so just use a counter plus the base image --- -tag: 2-u16.04-nng +tag: 3-u16.04-nng diff --git a/docker/bldr-ubuntu18-c-go/Dockerfile b/docker/bldr-ubuntu18-c-go/Dockerfile index f7f23b12..47e77fea 100644 --- a/docker/bldr-ubuntu18-c-go/Dockerfile +++ b/docker/bldr-ubuntu18-c-go/Dockerfile @@ -51,6 +51,13 @@ RUN wget -nv https://github.com/Kitware/CMake/releases/download/v3.14.5/cmake-3. RUN wget -nv https://dl.google.com/go/go1.12.linux-amd64.tar.gz \ && tar -xf go1.12.linux-amd64.tar.gz \ && mv go /usr/local +ENV PATH=$PATH:/usr/local/go/bin:/usr/lib/go-1.12/bin +RUN go get -u github.com/ory/go-acc \ + && mv ~/go/bin/go-acc /usr/local/go/bin + +RUN wget -nv https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-3.2.0.1227-linux.zip \ + && unzip sonar-scanner-cli-3.2.0.1227-linux.zip \ + && mv sonar-scanner-3.2.0.1227-linux /usr/local/ RUN wget -nv https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-linux.zip \ && unzip ninja-linux.zip \ diff --git a/docker/bldr-ubuntu18-c-go/container-tag.yaml b/docker/bldr-ubuntu18-c-go/container-tag.yaml index 15d012ee..a6a7a9e0 100644 --- a/docker/bldr-ubuntu18-c-go/container-tag.yaml +++ b/docker/bldr-ubuntu18-c-go/container-tag.yaml @@ -1,4 +1,4 @@ # Not feasible to show all the software versions # here so just use a counter plus the base image --- -tag: 2-u18.04-nng +tag: 3-u18.04-nng -- 2.16.6