feat(go): add testing deps to images (#161)

Updates: googleapis/google-cloud-go#4061
googleapis · Aug 9, 2021 · c530aac · c530aac
1 parent 070b026
commit c530aac
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 19 deletions.
diff --git a/go/go111/Dockerfile b/go/go111/Dockerfile
@@ -60,4 +60,7 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.c
     curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - && apt-get update -y && \
     apt-get install google-cloud-sdk -y
 
+# Install testing tools
+RUN go get github.com/jstemmer/go-junit-report
+
 WORKDIR $GOPATH
diff --git a/go/go112/Dockerfile b/go/go112/Dockerfile
@@ -16,8 +16,8 @@ FROM golang:1.12
 
 # Install dependencies
 RUN set -ex; \
-  apt-get update -y; \
-  apt-get install -y \
+    apt-get update -y; \
+    apt-get install -y \
     make build-essential libssl-dev zlib1g-dev libbz2-dev \
     libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev libncursesw5-dev \
     xz-utils tk-dev libffi-dev liblzma-dev python-openssl \
@@ -28,9 +28,9 @@ RUN set -ex; \
 # Install docker
 RUN curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - && \
     add-apt-repository \
-        "deb [arch=amd64] https://download.docker.com/linux/debian \
-        $(lsb_release -cs) \
-        stable" && \
+    "deb [arch=amd64] https://download.docker.com/linux/debian \
+    $(lsb_release -cs) \
+    stable" && \
     apt-get update && \
     apt-get install -y docker-ce docker-ce-cli containerd.io
 
@@ -60,4 +60,7 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.c
     curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - && apt-get update -y && \
     apt-get install google-cloud-sdk -y
 
+# Install test tools
+RUN GO111MODULE=on go get github.com/jstemmer/go-junit-report@latest
+
 WORKDIR $GOPATH
diff --git a/go/go113/Dockerfile b/go/go113/Dockerfile
@@ -31,6 +31,7 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.c
     apt-get install google-cloud-sdk -y
 
 # Install tools used in build
-RUN GO111MODULE=on go get honnef.co/go/tools/cmd/staticcheck@latest
+RUN GO111MODULE=on go get honnef.co/go/tools/cmd/staticcheck@latest && \
+    go get github.com/jstemmer/go-junit-report@latest
 
 WORKDIR $GOPATH
diff --git a/go/go114/Dockerfile b/go/go114/Dockerfile
@@ -31,6 +31,7 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.c
     apt-get install google-cloud-sdk -y
 
 # Install tools used in build
-RUN GO111MODULE=on go get honnef.co/go/tools/cmd/staticcheck@latest
+RUN GO111MODULE=on go get honnef.co/go/tools/cmd/staticcheck@latest && \
+    go get github.com/jstemmer/go-junit-report@latest
 
 WORKDIR $GOPATH
diff --git a/go/go115/Dockerfile b/go/go115/Dockerfile
@@ -17,8 +17,8 @@ FROM golang:1.15
 
 # Install dependencies
 RUN set -ex; \
-  apt-get update -y; \
-  apt-get install -y \
+    apt-get update -y; \
+    apt-get install -y \
     make build-essential libssl-dev zlib1g-dev libbz2-dev \
     libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev libncursesw5-dev \
     xz-utils tk-dev libffi-dev liblzma-dev python-openssl \
@@ -29,9 +29,9 @@ RUN set -ex; \
 # Install docker
 RUN curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - && \
     add-apt-repository \
-        "deb [arch=amd64] https://download.docker.com/linux/debian \
-        $(lsb_release -cs) \
-        stable" && \
+    "deb [arch=amd64] https://download.docker.com/linux/debian \
+    $(lsb_release -cs) \
+    stable" && \
     apt-get update && \
     apt-get install -y docker-ce docker-ce-cli containerd.io
 
@@ -62,6 +62,7 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.c
     apt-get install google-cloud-sdk -y
 
 # Install tools used in build
-RUN GO111MODULE=on go get honnef.co/go/tools/cmd/staticcheck@latest
+RUN GO111MODULE=on go get honnef.co/go/tools/cmd/staticcheck@latest && \
+    go get github.com/jstemmer/go-junit-report@latest
 
 WORKDIR $GOPATH
diff --git a/go/go116/Dockerfile b/go/go116/Dockerfile
@@ -16,8 +16,8 @@ FROM golang:1.16
 
 # Install dependencies
 RUN set -ex; \
-  apt-get update -y; \
-  apt-get install -y \
+    apt-get update -y; \
+    apt-get install -y \
     make build-essential libssl-dev zlib1g-dev libbz2-dev \
     libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev libncursesw5-dev \
     xz-utils tk-dev libffi-dev liblzma-dev python-openssl \
@@ -28,9 +28,9 @@ RUN set -ex; \
 # Install docker
 RUN curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - && \
     add-apt-repository \
-        "deb [arch=amd64] https://download.docker.com/linux/debian \
-        $(lsb_release -cs) \
-        stable" && \
+    "deb [arch=amd64] https://download.docker.com/linux/debian \
+    $(lsb_release -cs) \
+    stable" && \
     apt-get update && \
     apt-get install -y docker-ce docker-ce-cli containerd.io
 
@@ -61,6 +61,9 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.c
     apt-get install google-cloud-sdk -y
 
 # Install tools used in build
-RUN go install honnef.co/go/tools/cmd/staticcheck@latest
+RUN go install honnef.co/go/tools/cmd/staticcheck@latest && \
+    go install github.com/jstemmer/go-junit-report@latest && \
+    go install golang.org/x/lint/golint@latest && \
+    go install golang.org/x/tools/cmd/goimports@latest
 
 WORKDIR $GOPATH