From 560e22eaaf1e82c76f662b374f529792e22a1b47 Mon Sep 17 00:00:00 2001 From: "Rule Timothy (CC/EMT2)" Date: Mon, 4 Dec 2023 14:19:20 +0100 Subject: [PATCH] Relocate docker files to extra folder. Signed-off-by: Rule Timothy (CC/EMT2) --- .github/workflows/docker.yaml | 2 +- Makefile | 4 ++-- {docker => extra/docker}/clang-format/Dockerfile | 0 {docker => extra/docker}/clang-format/clang-format | 0 {docker => extra/docker}/clang-format/format.sh | 0 {docker => extra/docker}/flatc-builder/Dockerfile | 0 {docker => extra/docker}/gcc-builder/Dockerfile | 0 {docker => extra/docker}/python-builder/Dockerfile | 0 {docker => extra/docker}/python-builder/pip.conf | 0 extra/external/Makefile | 3 +++ 10 files changed, 6 insertions(+), 3 deletions(-) rename {docker => extra/docker}/clang-format/Dockerfile (100%) rename {docker => extra/docker}/clang-format/clang-format (100%) rename {docker => extra/docker}/clang-format/format.sh (100%) rename {docker => extra/docker}/flatc-builder/Dockerfile (100%) rename {docker => extra/docker}/gcc-builder/Dockerfile (100%) rename {docker => extra/docker}/python-builder/Dockerfile (100%) rename {docker => extra/docker}/python-builder/pip.conf (100%) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 8c9f1d2..22dc9cc 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -42,6 +42,6 @@ jobs: uses: docker/build-push-action@v4 with: push: true - context: ./docker/${{ matrix.image }} + context: ./extra/docker/${{ matrix.image }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/Makefile b/Makefile index 4b35fb3..44d38d1 100644 --- a/Makefile +++ b/Makefile @@ -52,8 +52,8 @@ default: build docker: for d in $(DOCKER_DIRS) ;\ do \ - docker build -f docker/$$d/Dockerfile \ - --tag $$d:latest ./docker/$$d ;\ + docker build -f extra/docker/$$d/Dockerfile \ + --tag $$d:latest ./extra/docker/$$d ;\ done; build: diff --git a/docker/clang-format/Dockerfile b/extra/docker/clang-format/Dockerfile similarity index 100% rename from docker/clang-format/Dockerfile rename to extra/docker/clang-format/Dockerfile diff --git a/docker/clang-format/clang-format b/extra/docker/clang-format/clang-format similarity index 100% rename from docker/clang-format/clang-format rename to extra/docker/clang-format/clang-format diff --git a/docker/clang-format/format.sh b/extra/docker/clang-format/format.sh similarity index 100% rename from docker/clang-format/format.sh rename to extra/docker/clang-format/format.sh diff --git a/docker/flatc-builder/Dockerfile b/extra/docker/flatc-builder/Dockerfile similarity index 100% rename from docker/flatc-builder/Dockerfile rename to extra/docker/flatc-builder/Dockerfile diff --git a/docker/gcc-builder/Dockerfile b/extra/docker/gcc-builder/Dockerfile similarity index 100% rename from docker/gcc-builder/Dockerfile rename to extra/docker/gcc-builder/Dockerfile diff --git a/docker/python-builder/Dockerfile b/extra/docker/python-builder/Dockerfile similarity index 100% rename from docker/python-builder/Dockerfile rename to extra/docker/python-builder/Dockerfile diff --git a/docker/python-builder/pip.conf b/extra/docker/python-builder/pip.conf similarity index 100% rename from docker/python-builder/pip.conf rename to extra/docker/python-builder/pip.conf diff --git a/extra/external/Makefile b/extra/external/Makefile index 31a5132..0468eed 100644 --- a/extra/external/Makefile +++ b/extra/external/Makefile @@ -2,6 +2,9 @@ # # SPDX-License-Identifier: Apache-2.0 +export EXTERNAL_BUILD_DIR ?= /dev/null + + default: build setup: