Skip to content

Commit

Permalink
Switch to upstream Go build images. (#419)
Browse files Browse the repository at this point in the history
These internal `gcr.io/heptio-images/golang` images are deprecated. It looks like `bash` was the only thing that the Sonobuoy runtime image needed that wasn't in the upstream `golang:1.9-alpine3.6` image.

Signed-off-by: Matt Moyer <moyer@heptio.com>
  • Loading branch information
mattmoyer authored and chuckha committed Apr 24, 2018
1 parent 9c53013 commit 857d1fb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM gcr.io/heptio-images/golang:1.9-alpine3.6
FROM golang:1.9-alpine3.6
MAINTAINER Timothy St. Clair "tstclair@heptio.com"

RUN apk add --no-cache ca-certificates
RUN apk add --no-cache ca-certificates bash
ADD sonobuoy /sonobuoy
ADD scripts/run_master.sh /run_master.sh
ADD scripts/run_single_node_worker.sh /run_single_node_worker.sh
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ ifneq ($(VERBOSE),)
VERBOSE_FLAG = -v
endif
BUILDMNT = /go/src/$(GOTARGET)
BUILD_IMAGE ?= gcr.io/heptio-images/golang:1.9-alpine3.6
BUILD_IMAGE ?= golang:1.9-alpine3.6
BUILDCMD = go build -o $(TARGET) $(VERBOSE_FLAG) -ldflags "-X github.com/heptio/sonobuoy/pkg/buildinfo.Version=$(GIT_VERSION)"
BUILD = $(BUILDCMD) $(GOTARGET)

Expand Down

0 comments on commit 857d1fb

Please sign in to comment.