Skip to content

Commit c530aac

Browse files
authored
feat(go): add testing deps to images (#161)
Updates: googleapis/google-cloud-go#4061
1 parent 070b026 commit c530aac

File tree

6 files changed

+31
-19
lines changed

6 files changed

+31
-19
lines changed

go/go111/Dockerfile

+3
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,7 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.c
6060
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 && \
6161
apt-get install google-cloud-sdk -y
6262

63+
# Install testing tools
64+
RUN go get github.com/jstemmer/go-junit-report
65+
6366
WORKDIR $GOPATH

go/go112/Dockerfile

+8-5
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ FROM golang:1.12
1616

1717
# Install dependencies
1818
RUN set -ex; \
19-
apt-get update -y; \
20-
apt-get install -y \
19+
apt-get update -y; \
20+
apt-get install -y \
2121
make build-essential libssl-dev zlib1g-dev libbz2-dev \
2222
libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev libncursesw5-dev \
2323
xz-utils tk-dev libffi-dev liblzma-dev python-openssl \
@@ -28,9 +28,9 @@ RUN set -ex; \
2828
# Install docker
2929
RUN curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - && \
3030
add-apt-repository \
31-
"deb [arch=amd64] https://download.docker.com/linux/debian \
32-
$(lsb_release -cs) \
33-
stable" && \
31+
"deb [arch=amd64] https://download.docker.com/linux/debian \
32+
$(lsb_release -cs) \
33+
stable" && \
3434
apt-get update && \
3535
apt-get install -y docker-ce docker-ce-cli containerd.io
3636

@@ -60,4 +60,7 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.c
6060
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 && \
6161
apt-get install google-cloud-sdk -y
6262

63+
# Install test tools
64+
RUN GO111MODULE=on go get github.com/jstemmer/go-junit-report@latest
65+
6366
WORKDIR $GOPATH

go/go113/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.c
3131
apt-get install google-cloud-sdk -y
3232

3333
# Install tools used in build
34-
RUN GO111MODULE=on go get honnef.co/go/tools/cmd/staticcheck@latest
34+
RUN GO111MODULE=on go get honnef.co/go/tools/cmd/staticcheck@latest && \
35+
go get github.com/jstemmer/go-junit-report@latest
3536

3637
WORKDIR $GOPATH

go/go114/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.c
3131
apt-get install google-cloud-sdk -y
3232

3333
# Install tools used in build
34-
RUN GO111MODULE=on go get honnef.co/go/tools/cmd/staticcheck@latest
34+
RUN GO111MODULE=on go get honnef.co/go/tools/cmd/staticcheck@latest && \
35+
go get github.com/jstemmer/go-junit-report@latest
3536

3637
WORKDIR $GOPATH

go/go115/Dockerfile

+7-6
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ FROM golang:1.15
1717

1818
# Install dependencies
1919
RUN set -ex; \
20-
apt-get update -y; \
21-
apt-get install -y \
20+
apt-get update -y; \
21+
apt-get install -y \
2222
make build-essential libssl-dev zlib1g-dev libbz2-dev \
2323
libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev libncursesw5-dev \
2424
xz-utils tk-dev libffi-dev liblzma-dev python-openssl \
@@ -29,9 +29,9 @@ RUN set -ex; \
2929
# Install docker
3030
RUN curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - && \
3131
add-apt-repository \
32-
"deb [arch=amd64] https://download.docker.com/linux/debian \
33-
$(lsb_release -cs) \
34-
stable" && \
32+
"deb [arch=amd64] https://download.docker.com/linux/debian \
33+
$(lsb_release -cs) \
34+
stable" && \
3535
apt-get update && \
3636
apt-get install -y docker-ce docker-ce-cli containerd.io
3737

@@ -62,6 +62,7 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.c
6262
apt-get install google-cloud-sdk -y
6363

6464
# Install tools used in build
65-
RUN GO111MODULE=on go get honnef.co/go/tools/cmd/staticcheck@latest
65+
RUN GO111MODULE=on go get honnef.co/go/tools/cmd/staticcheck@latest && \
66+
go get github.com/jstemmer/go-junit-report@latest
6667

6768
WORKDIR $GOPATH

go/go116/Dockerfile

+9-6
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ FROM golang:1.16
1616

1717
# Install dependencies
1818
RUN set -ex; \
19-
apt-get update -y; \
20-
apt-get install -y \
19+
apt-get update -y; \
20+
apt-get install -y \
2121
make build-essential libssl-dev zlib1g-dev libbz2-dev \
2222
libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev libncursesw5-dev \
2323
xz-utils tk-dev libffi-dev liblzma-dev python-openssl \
@@ -28,9 +28,9 @@ RUN set -ex; \
2828
# Install docker
2929
RUN curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - && \
3030
add-apt-repository \
31-
"deb [arch=amd64] https://download.docker.com/linux/debian \
32-
$(lsb_release -cs) \
33-
stable" && \
31+
"deb [arch=amd64] https://download.docker.com/linux/debian \
32+
$(lsb_release -cs) \
33+
stable" && \
3434
apt-get update && \
3535
apt-get install -y docker-ce docker-ce-cli containerd.io
3636

@@ -61,6 +61,9 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.c
6161
apt-get install google-cloud-sdk -y
6262

6363
# Install tools used in build
64-
RUN go install honnef.co/go/tools/cmd/staticcheck@latest
64+
RUN go install honnef.co/go/tools/cmd/staticcheck@latest && \
65+
go install github.com/jstemmer/go-junit-report@latest && \
66+
go install golang.org/x/lint/golint@latest && \
67+
go install golang.org/x/tools/cmd/goimports@latest
6568

6669
WORKDIR $GOPATH

0 commit comments

Comments
 (0)