From 93d099a2f0f7e0ee30f5b21754c32296d66af55e Mon Sep 17 00:00:00 2001 From: Tom Moulard Date: Tue, 16 Mar 2021 12:08:04 +0100 Subject: [PATCH] Fix travis docker image pulling for docs --- .travis.yml | 2 +- Makefile | 4 ++++ docs/Makefile | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 89140b9ec..6a42550c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ env: script: - echo "Skipping tests... (Tests are executed on SemaphoreCI)" -- if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then make docs; fi +- if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then travis_retry make docs-pull-images && make docs; fi before_deploy: - > diff --git a/Makefile b/Makefile index 2c60c2d03..fb0d20c8f 100644 --- a/Makefile +++ b/Makefile @@ -127,6 +127,10 @@ docs: docs-serve: make -C ./docs docs-serve +## Pull image for doc building +docs-pull-images: + make -C ./docs docs-pull-images + ## Generate CRD clientset generate-crd: ./script/update-generated-crd-code.sh diff --git a/docs/Makefile b/docs/Makefile index 6e25c59ae..85546ac68 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -12,7 +12,7 @@ TRAEFIK_DOCS_CHECK_IMAGE ?= $(TRAEFIK_DOCS_BUILD_IMAGE)-check SITE_DIR := $(CURDIR)/site DOCKER_RUN_DOC_PORT := 8000 -DOCKER_RUN_DOC_MOUNTS := -v $(CURDIR):/mkdocs +DOCKER_RUN_DOC_MOUNTS := -v $(CURDIR):/mkdocs DOCKER_RUN_DOC_OPTS := --rm $(DOCKER_RUN_DOC_MOUNTS) -p $(DOCKER_RUN_DOC_PORT):8000 # Default: generates the documentation into $(SITE_DIR) @@ -22,6 +22,10 @@ docs: docs-clean docs-image docs-lint docs-build docs-verify docs-serve: docs-image docker run $(DOCKER_RUN_DOC_OPTS) $(TRAEFIK_DOCS_BUILD_IMAGE) mkdocs serve +## Pull image for doc building +docs-pull-images: + grep --no-filename -E '^FROM' ./*.Dockerfile | awk '{print $$2}' | sort | uniq | xargs -P 6 -n 1 docker pull + # Utilities Targets for each step docs-image: docker build -t $(TRAEFIK_DOCS_BUILD_IMAGE) -f docs.Dockerfile ./