Skip to content

Commit

Permalink
env: include make in linux/amd64 builder imagesk
Browse files Browse the repository at this point in the history
Some benchmarks in x/benchmarks from external sources wrap the go tool
in make. Add make to the linux/amd64 builders where these benchmarks will
run.

For golang/go#49207.

Change-Id: I4ea16c0aa63d1b520c61d0a2b9dabffdd8bb7094
Reviewed-on: https://go-review.googlesource.com/c/build/+/382894
Trust: Michael Knyszek <[email protected]>
Run-TryBot: Michael Knyszek <[email protected]>
TryBot-Result: Gopher Robot <[email protected]>
Reviewed-by: Carlos Amedee <[email protected]>
  • Loading branch information
mknyszek committed Feb 3, 2022
1 parent 47640b7 commit cb8d385
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 0 deletions.
1 change: 1 addition & 0 deletions env/linux-x86-alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ RUN apk add --no-cache \
go \
libc-dev \
lsof \
make \
openssh \
procps \
strace
Expand Down
1 change: 1 addition & 0 deletions env/linux-x86-bullseye/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ RUN apt-get update && apt-get install -y \
libgles2-mesa-dev \
libopenal-dev \
lsof \
make \
netbase \
openssh-server \
procps \
Expand Down
1 change: 1 addition & 0 deletions env/linux-x86-buster/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ RUN apt-get update && apt-get install -y \
fonts-droid-fallback \
openssh-server \
iptables \
make \
&& rm -rf /var/lib/apt/lists/*

RUN mkdir -p /go1.4-amd64 \
Expand Down
1 change: 1 addition & 0 deletions env/linux-x86-clang/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ RUN apt-get update && apt-get install -y \
psmisc \
openssh-server \
netbase \
make \
&& rm -rf /var/lib/apt/lists/* \
&& rm -f /usr/bin/gcc

Expand Down
1 change: 1 addition & 0 deletions env/linux-x86-debug/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ RUN apt-get update && apt-get install -y \
git \
iptables \
screen \
make \
&& rm -rf /var/lib/apt/lists/*

CMD ["/usr/bin/bash"]
Expand Down
1 change: 1 addition & 0 deletions env/linux-x86-fedora/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ RUN yum -y update && yum -y install \
strace \
which \
openssh-server \
make \
&& true

RUN ssh-keygen -A
Expand Down
1 change: 1 addition & 0 deletions env/linux-x86-jessie/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ RUN apt-get update && apt-get install -y \
fonts-droid \
openssh-server \
iptables \
make \
&& rm -rf /var/lib/apt/lists/*

RUN mkdir -p /go1.4-amd64 \
Expand Down
1 change: 1 addition & 0 deletions env/linux-x86-sid/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ RUN apt-get update && apt-get install -y \
qemu-user \
netbase \
openssh-server \
make \
&& rm -rf /var/lib/apt/lists/*

# Otherwise we get "Missing privilege separation directory: /run/sshd" ...
Expand Down
1 change: 1 addition & 0 deletions env/linux-x86-stretch/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ RUN apt-get update && apt-get install -y \
subversion \
iptables \
swig \
make \
&& rm -rf /var/lib/apt/lists/*

RUN mkdir -p /go1.4-amd64 \
Expand Down

0 comments on commit cb8d385

Please sign in to comment.