From f8cbdcfa40a80567a4f6fc3823e46cb37d219cb1 Mon Sep 17 00:00:00 2001 From: Justin Newberry Date: Mon, 14 Aug 2023 14:36:17 -0700 Subject: [PATCH] CI: docs speedup by caching first stage (#29397) * docs speedup * fix tags on docs build * build docs without build-push-action --- .github/workflows/tools_tests.yaml | 6 ++++-- docs/docker/Dockerfile | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tools_tests.yaml b/.github/workflows/tools_tests.yaml index 04ea1fd111..0ee390d5e9 100644 --- a/.github/workflows/tools_tests.yaml +++ b/.github/workflows/tools_tests.yaml @@ -81,9 +81,11 @@ jobs: submodules: true - name: Build docker container run: | - DOCKER_BUILDKIT=1 docker build --pull --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from $DOCKER_REGISTRY/openpilot-docs:latest -t $DOCKER_REGISTRY/openpilot-docs:latest -f docs/docker/Dockerfile . + DOCKER_BUILDKIT=1 docker build --pull --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from $DOCKER_REGISTRY/openpilot-docs-base:latest -t $DOCKER_REGISTRY/openpilot-docs-base:latest -f docs/docker/Dockerfile --target openpilot-docs-base . + DOCKER_BUILDKIT=1 docker build --pull --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from $DOCKER_REGISTRY/openpilot-docs-base:latest --cache-from $DOCKER_REGISTRY/openpilot-docs:latest -t $DOCKER_REGISTRY/openpilot-docs:latest -f docs/docker/Dockerfile . - name: Push docker container if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'commaai/openpilot' run: | $DOCKER_LOGIN - docker push $DOCKER_REGISTRY/openpilot-docs:latest + docker push $DOCKER_REGISTRY/openpilot-docs-base:latest + docker push $DOCKER_REGISTRY/openpilot-docs:latest \ No newline at end of file diff --git a/docs/docker/Dockerfile b/docs/docker/Dockerfile index 08b318a59a..63564a6fff 100644 --- a/docs/docker/Dockerfile +++ b/docs/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/commaai/openpilot-base:latest +FROM ghcr.io/commaai/openpilot-base:latest as openpilot-docs-base ENV PYTHONUNBUFFERED 1