Skip to content

Commit a41e7d3

Browse files
author
Alexander Smirnov
committed
use cache mirror
1 parent 5b5e74d commit a41e7d3

File tree

5 files changed

+13
-33
lines changed

5 files changed

+13
-33
lines changed

.github/workflows/test-on-push-and-pr.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,38 +11,38 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v4
1515
- name: Run 'pr' target
1616
run: make pr
1717

1818
alpine:
1919
runs-on: ubuntu-latest
2020

2121
steps:
22-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v4
2323
- name: Run alpine integration tests
2424
run: DISTRO=alpine make test-integ
2525

2626
amazonlinux:
2727
runs-on: ubuntu-latest
2828

2929
steps:
30-
- uses: actions/checkout@v2
30+
- uses: actions/checkout@v4
3131
- name: Run amazonlinux integration tests
3232
run: DISTRO=amazonlinux make test-integ
3333

3434
debian:
3535
runs-on: ubuntu-latest
3636

3737
steps:
38-
- uses: actions/checkout@v2
38+
- uses: actions/checkout@v4
3939
- name: Run debian integration tests
4040
run: DISTRO=debian make test-integ
4141

4242
ubuntu:
4343
runs-on: ubuntu-latest
4444

4545
steps:
46-
- uses: actions/checkout@v2
46+
- uses: actions/checkout@v4
4747
- name: Run ubuntu integration tests
4848
run: DISTRO=ubuntu make test-integ

tests/integration/codebuild/buildspec.os.alpine.yml

+2-7
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,8 @@ phases:
5252
echo "COPY ${SCRATCH_DIR}/${RIE} /usr/bin/${RIE}" >> \
5353
"${SCRATCH_DIR}/Dockerfile.echo.${OS_DISTRIBUTION}.tmp"
5454
- >
55-
if [[ -z "${DOCKERHUB_USERNAME}" && -z "${DOCKERHUB_PASSWORD}" ]];
56-
then
57-
echo "DockerHub credentials not set as CodeBuild environment variables. Continuing without docker login."
58-
else
59-
echo "Performing DockerHub login . . ."
60-
docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
61-
fi
55+
echo '{"registry-mirrors": ["https://mirror.gcr.io"]}' > /etc/docker/daemon.json
56+
service docker restart
6257
- echo "Building image ${IMAGE_TAG}"
6358
- >
6459
docker build . \

tests/integration/codebuild/buildspec.os.amazonlinux.2.yml

+2-7
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,8 @@ phases:
4646
echo "COPY ${SCRATCH_DIR}/${RIE} /usr/bin/${RIE}" >> \
4747
"${SCRATCH_DIR}/Dockerfile.echo.${OS_DISTRIBUTION}.tmp"
4848
- >
49-
if [[ -z "${DOCKERHUB_USERNAME}" && -z "${DOCKERHUB_PASSWORD}" ]];
50-
then
51-
echo "DockerHub credentials not set as CodeBuild environment variables. Continuing without docker login."
52-
else
53-
echo "Performing DockerHub login . . ."
54-
docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
55-
fi
49+
echo '{"registry-mirrors": ["https://mirror.gcr.io"]}' > /etc/docker/daemon.json
50+
service docker restart
5651
- echo "Building image ${IMAGE_TAG}"
5752
- >
5853
docker build . \

tests/integration/codebuild/buildspec.os.debian.yml

+2-7
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,8 @@ phases:
5050
echo "RUN apt-get update && apt-get install -y curl" >> \
5151
"${SCRATCH_DIR}/Dockerfile.echo.${OS_DISTRIBUTION}.tmp"
5252
- >
53-
if [[ -z "${DOCKERHUB_USERNAME}" && -z "${DOCKERHUB_PASSWORD}" ]];
54-
then
55-
echo "DockerHub credentials not set as CodeBuild environment variables. Continuing without docker login."
56-
else
57-
echo "Performing DockerHub login . . ."
58-
docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
59-
fi
53+
echo '{"registry-mirrors": ["https://mirror.gcr.io"]}' > /etc/docker/daemon.json
54+
service docker restart
6055
- echo "Building image ${IMAGE_TAG}"
6156
- >
6257
docker build . \

tests/integration/codebuild/buildspec.os.ubuntu.yml

+2-7
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,8 @@ phases:
4848
echo "COPY ${SCRATCH_DIR}/${RIE} /usr/bin/${RIE}" >> \
4949
"${SCRATCH_DIR}/Dockerfile.echo.${OS_DISTRIBUTION}.tmp"
5050
- >
51-
if [[ -z "${DOCKERHUB_USERNAME}" && -z "${DOCKERHUB_PASSWORD}" ]];
52-
then
53-
echo "DockerHub credentials not set as CodeBuild environment variables. Continuing without docker login."
54-
else
55-
echo "Performing DockerHub login . . ."
56-
docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
57-
fi
51+
echo '{"registry-mirrors": ["https://mirror.gcr.io"]}' > /etc/docker/daemon.json
52+
service docker restart
5853
- echo "Building image ${IMAGE_TAG}"
5954
- >
6055
docker build . \

0 commit comments

Comments
 (0)