use hashicorp docker mirror to prevent rate limit (#9070)

This commit is contained in:
Alvin Huang 2020-10-30 17:59:13 -04:00 committed by GitHub
parent c8c87ec317
commit d6652b0bc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 17 deletions

View File

@ -3,9 +3,8 @@ version: 2
references: references:
images: images:
go: &GOLANG_IMAGE circleci/golang:1.14.9 go: &GOLANG_IMAGE docker.mirror.hashicorp.services/circleci/golang:1.14.9
middleman: &MIDDLEMAN_IMAGE hashicorp/middleman-hashicorp:0.3.40 ember: &EMBER_IMAGE docker.mirror.hashicorp.services/circleci/node:12-browsers
ember: &EMBER_IMAGE circleci/node:12-browsers
paths: paths:
test-results: &TEST_RESULTS_DIR /tmp/test-results test-results: &TEST_RESULTS_DIR /tmp/test-results
@ -440,7 +439,7 @@ jobs:
# upload dev docker image # upload dev docker image
dev-upload-docker: dev-upload-docker:
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:
<<: *ENVIRONMENT <<: *ENVIRONMENT
steps: steps:
@ -456,7 +455,7 @@ jobs:
# Run integration tests on nomad/v0.8.7 # Run integration tests on nomad/v0.8.7
nomad-integration-0_8: nomad-integration-0_8:
docker: docker:
- image: circleci/golang:1.10 - image: docker.mirror.hashicorp.services/circleci/golang:1.10
environment: environment:
<<: *ENVIRONMENT <<: *ENVIRONMENT
NOMAD_WORKING_DIR: &NOMAD_WORKING_DIR /go/src/github.com/hashicorp/nomad NOMAD_WORKING_DIR: &NOMAD_WORKING_DIR /go/src/github.com/hashicorp/nomad
@ -505,7 +504,7 @@ jobs:
build-website-docker-image: build-website-docker-image:
docker: docker:
- image: circleci/buildpack-deps - image: docker.mirror.hashicorp.services/circleci/buildpack-deps
shell: /usr/bin/env bash -euo pipefail -c shell: /usr/bin/env bash -euo pipefail -c
steps: steps:
- checkout - checkout
@ -531,7 +530,7 @@ jobs:
algolia-index: algolia-index:
docker: docker:
- image: node:12 - image: docker.mirror.hashicorp.services/node:12
steps: steps:
- checkout - checkout
- run: - 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 # only runs on master: checks latest commit to see if the PR associated has a backport/* or docs* label to cherry-pick
cherry-picker: cherry-picker:
docker: docker:
- image: alpine:3.11 - image: docker.mirror.hashicorp.services/alpine:3.11
steps: steps:
- run: apk add --no-cache --no-progress git bash curl ncurses jq openssh-client - run: apk add --no-cache --no-progress git bash curl ncurses jq openssh-client
- checkout - checkout
@ -834,7 +833,7 @@ jobs:
trigger-oss-merge: trigger-oss-merge:
docker: docker:
- image: alpine:3.11 - image: docker.mirror.hashicorp.services/alpine:3.11
steps: steps:
- run: apk add --no-cache --no-progress curl jq - run: apk add --no-cache --no-progress curl jq
- run: - run:

View File

@ -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 curl
RUN apk add openssl RUN apk add openssl

View File

@ -3,5 +3,5 @@ ARG ENVOY_VERSION
FROM consul-dev as consul 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 COPY --from=consul /bin/consul /bin/consul

View File

@ -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 '*.hcl' -exec cp -f {} workdir/${DC}/consul \;
find ${CASE_DIR}/${DC} -type f -name '*.bats' -exec cp -f {} workdir/${DC}/bats \; find ${CASE_DIR}/${DC} -type f -name '*.bats' -exec cp -f {} workdir/${DC}/bats \;
fi fi
if test -d "${CASE_DIR}/data" if test -d "${CASE_DIR}/data"
then then
cp -r ${CASE_DIR}/data/* workdir/${DC}/data cp -r ${CASE_DIR}/data/* workdir/${DC}/data
fi fi
return 0 return 0
} }
@ -432,7 +432,7 @@ function common_run_container_sidecar_proxy {
docker run -d --name $(container_name_prev) \ docker run -d --name $(container_name_prev) \
$WORKDIR_SNIPPET \ $WORKDIR_SNIPPET \
$(network_snippet $DC) \ $(network_snippet $DC) \
"envoyproxy/envoy:v${ENVOY_VERSION}" \ "docker.mirror.hashicorp.services/envoyproxy/envoy:v${ENVOY_VERSION}" \
envoy \ envoy \
-c /workdir/${DC}/envoy/${service}-bootstrap.json \ -c /workdir/${DC}/envoy/${service}-bootstrap.json \
-l debug \ -l debug \
@ -495,7 +495,7 @@ function common_run_container_gateway {
docker run -d --name $(container_name_prev) \ docker run -d --name $(container_name_prev) \
$WORKDIR_SNIPPET \ $WORKDIR_SNIPPET \
$(network_snippet $DC) \ $(network_snippet $DC) \
"envoyproxy/envoy:v${ENVOY_VERSION}" \ "docker.mirror.hashicorp.services/envoyproxy/envoy:v${ENVOY_VERSION}" \
envoy \ envoy \
-c /workdir/${DC}/envoy/${name}-bootstrap.json \ -c /workdir/${DC}/envoy/${name}-bootstrap.json \
-l debug \ -l debug \

View File

@ -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 RUN apk add --update --no-cache git make g++ automake autoconf libtool nasm libpng-dev
COPY ./package.json /website/package.json COPY ./package.json /website/package.json