Use updated container, now built in the tools repo. (#4722)

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: gcr.io/istio-testing/website-builder:2019-05-03
+      - image: gcr.io/istio-testing/website-tools:2019-07-25
 
     working_directory: ~/site
 

Makefile

@@ -1,7 +1,7 @@
 ISTIO_SERVE_DOMAIN ?= localhost
 export ISTIO_SERVE_DOMAIN
 
-img := gcr.io/istio-testing/website-builder:2019-05-03
+img := gcr.io/istio-testing/website-tools:2019-07-25
 docker := docker run -e INTERNAL_ONLY=true -t -i --sig-proxy=true --rm -v $(shell pwd):/site -w /site $(img)
 
 ifeq ($(INTERNAL_ONLY),)

scripts/Dockerfile

@@ -1,47 +0,0 @@
-FROM ruby:2.6.2-alpine
-
-RUN echo 'gem: --no-document' >> /etc/gemrc
-
-RUN apk add --no-cache \
-    nodejs-current-npm \
-    ruby \
-    ruby-dev \
-    build-base \
-    gcc \
-    libc-dev \
-    zlib-dev \
-    libxslt-dev \
-    libxml2-dev \
-    libcurl \
-    git \
-    bash \
-    && apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted
-
-ENV HUGO_VERSION=0.55.5
-ADD https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_VERSION}_Linux-64bit.tar.gz /tmp
-RUN tar -xf /tmp/hugo_${HUGO_VERSION}_Linux-64bit.tar.gz -C /tmp \
-    && mkdir -p /usr/local/sbin \
-    && mv /tmp/hugo /usr/local/sbin/hugo \
-    && rm -rf /tmp/hugo_${HUGO_VERSION}_linux_amd64 \
-    && rm -rf /tmp/hugo_${HUGO_VERSION}_Linux-64bit.tar.gz \
-    && rm -rf /tmp/LICENSE.md \
-    && rm -rf /tmp/README.md
-
-RUN npm install -g \
-    sass \
-    sass-lint \
-    typescript \
-    tslint \
-    markdown-spellcheck \
-    svgstore-cli \
-    svgo \
-    @babel/cli \
-    @babel/core
-RUN npm install babel-preset-minify --save-dev
-
-RUN gem install mdl
-RUN gem install html-proofer -v 3.9.2
-
-ENV PATH /usr/bin:$PATH
-
-CMD [ "/usr/bin/ruby", "-v"]

scripts/build_and_push_docker.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-HUB=gcr.io/istio-testing
-VERSION=$(date +%Y-%m-%d)
-
-docker build --no-cache -t ${HUB}/website-builder:${VERSION} .
-docker push ${HUB}/website-builder:${VERSION}