From d6652b0bc9bdf76fd5566bcd7af3a46d2a854ef8 Mon Sep 17 00:00:00 2001
From: Alvin Huang <17609145+alvin-huang@users.noreply.github.com>
Date: Fri, 30 Oct 2020 17:59:13 -0400
Subject: [PATCH] use hashicorp docker mirror to prevent rate limit (#9070)

---
 .circleci/config.yml                            | 17 ++++++++---------
 test/integration/connect/envoy/Dockerfile-bats  |  4 ++--
 .../connect/envoy/Dockerfile-consul-envoy       |  2 +-
 test/integration/connect/envoy/run-tests.sh     |  8 ++++----
 website/Dockerfile                              |  2 +-
 5 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d2f556612..eef74b31f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,9 +3,8 @@ version: 2
 
 references:
   images:
-    go: &GOLANG_IMAGE circleci/golang:1.14.9
-    middleman: &MIDDLEMAN_IMAGE hashicorp/middleman-hashicorp:0.3.40
-    ember: &EMBER_IMAGE circleci/node:12-browsers
+    go: &GOLANG_IMAGE docker.mirror.hashicorp.services/circleci/golang:1.14.9
+    ember: &EMBER_IMAGE docker.mirror.hashicorp.services/circleci/node:12-browsers
 
   paths:
     test-results: &TEST_RESULTS_DIR /tmp/test-results
@@ -440,7 +439,7 @@ jobs:
   # upload dev docker image
   dev-upload-docker:
     docker:
-      - image: circleci/golang:latest # use a circleci image so the attach_workspace step works (has ca-certs installed)
+      - image: *GOLANG_IMAGE # use a circleci image so the attach_workspace step works (has ca-certs installed)
     environment:
       <<: *ENVIRONMENT
     steps:
@@ -456,7 +455,7 @@ jobs:
   # Run integration tests on nomad/v0.8.7
   nomad-integration-0_8:
     docker:
-      - image: circleci/golang:1.10
+      - image: docker.mirror.hashicorp.services/circleci/golang:1.10
     environment:
       <<: *ENVIRONMENT
       NOMAD_WORKING_DIR: &NOMAD_WORKING_DIR /go/src/github.com/hashicorp/nomad
@@ -505,7 +504,7 @@ jobs:
 
   build-website-docker-image:
     docker:
-      - image: circleci/buildpack-deps
+      - image: docker.mirror.hashicorp.services/circleci/buildpack-deps
     shell: /usr/bin/env bash -euo pipefail -c
     steps:
       - checkout
@@ -531,7 +530,7 @@ jobs:
 
   algolia-index:
     docker:
-      - image: node:12
+      - image: docker.mirror.hashicorp.services/node:12
     steps:
       - checkout
       - run:
@@ -822,7 +821,7 @@ jobs:
   # only runs on master: checks latest commit to see if the PR associated has a backport/* or docs* label to cherry-pick
   cherry-picker:
     docker:
-      - image: alpine:3.11
+      - image: docker.mirror.hashicorp.services/alpine:3.11
     steps:
       - run: apk add --no-cache --no-progress git bash curl ncurses jq openssh-client
       - checkout
@@ -834,7 +833,7 @@ jobs:
 
   trigger-oss-merge:
     docker:
-      - image: alpine:3.11
+      - image: docker.mirror.hashicorp.services/alpine:3.11
     steps:
       - run: apk add --no-cache --no-progress curl jq
       - run:
diff --git a/test/integration/connect/envoy/Dockerfile-bats b/test/integration/connect/envoy/Dockerfile-bats
index 665cb866d..16c4c1e45 100644
--- a/test/integration/connect/envoy/Dockerfile-bats
+++ b/test/integration/connect/envoy/Dockerfile-bats
@@ -1,6 +1,6 @@
-FROM fortio/fortio AS fortio
+FROM docker.mirror.hashicorp.services/fortio/fortio AS fortio
 
-FROM bats/bats:latest
+FROM docker.mirror.hashicorp.services/bats/bats:latest
 
 RUN apk add curl
 RUN apk add openssl
diff --git a/test/integration/connect/envoy/Dockerfile-consul-envoy b/test/integration/connect/envoy/Dockerfile-consul-envoy
index a90d14997..b6d5b3e8e 100644
--- a/test/integration/connect/envoy/Dockerfile-consul-envoy
+++ b/test/integration/connect/envoy/Dockerfile-consul-envoy
@@ -3,5 +3,5 @@ ARG ENVOY_VERSION
 
 FROM consul-dev as consul
 
-FROM envoyproxy/envoy:v${ENVOY_VERSION}
+FROM docker.mirror.hashicorp.services/envoyproxy/envoy:v${ENVOY_VERSION}
 COPY --from=consul /bin/consul /bin/consul
diff --git a/test/integration/connect/envoy/run-tests.sh b/test/integration/connect/envoy/run-tests.sh
index c00825f18..cb7fcb857 100755
--- a/test/integration/connect/envoy/run-tests.sh
+++ b/test/integration/connect/envoy/run-tests.sh
@@ -68,12 +68,12 @@ function init_workdir {
     find ${CASE_DIR}/${DC} -type f -name '*.hcl' -exec cp -f {} workdir/${DC}/consul \;
     find ${CASE_DIR}/${DC} -type f -name '*.bats' -exec cp -f {} workdir/${DC}/bats \;
   fi
-  
+
   if test -d "${CASE_DIR}/data"
   then
     cp -r ${CASE_DIR}/data/* workdir/${DC}/data
   fi
-  
+
   return 0
 }
 
@@ -432,7 +432,7 @@ function common_run_container_sidecar_proxy {
   docker run -d --name $(container_name_prev) \
     $WORKDIR_SNIPPET \
     $(network_snippet $DC) \
-    "envoyproxy/envoy:v${ENVOY_VERSION}" \
+    "docker.mirror.hashicorp.services/envoyproxy/envoy:v${ENVOY_VERSION}" \
     envoy \
     -c /workdir/${DC}/envoy/${service}-bootstrap.json \
     -l debug \
@@ -495,7 +495,7 @@ function common_run_container_gateway {
   docker run -d --name $(container_name_prev) \
     $WORKDIR_SNIPPET \
     $(network_snippet $DC) \
-    "envoyproxy/envoy:v${ENVOY_VERSION}" \
+    "docker.mirror.hashicorp.services/envoyproxy/envoy:v${ENVOY_VERSION}" \
     envoy \
     -c /workdir/${DC}/envoy/${name}-bootstrap.json \
     -l debug \
diff --git a/website/Dockerfile b/website/Dockerfile
index 182f4fb58..088b29539 100644
--- a/website/Dockerfile
+++ b/website/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:10.16.3-alpine
+FROM docker.mirror.hashicorp.services/node:10.16.3-alpine
 RUN apk add --update --no-cache git make g++ automake autoconf libtool nasm libpng-dev
 
 COPY ./package.json /website/package.json