Relocate docker files to extra folder.

Signed-off-by: Rule Timothy (CC/EMT2) <Timothy.Rule@de.bosch.com>
boschglobal · Dec 4, 2023 · 560e22e · 560e22e
1 parent bbb1e96
commit 560e22e
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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 → extra/docker/clang-format/Dockerfile b/docker/clang-format/Dockerfile → extra/docker/clang-format/Dockerfile
diff --git a/docker/clang-format/clang-format → extra/docker/clang-format/clang-format b/docker/clang-format/clang-format → extra/docker/clang-format/clang-format
diff --git a/docker/clang-format/format.sh → extra/docker/clang-format/format.sh b/docker/clang-format/format.sh → extra/docker/clang-format/format.sh
diff --git a/docker/flatc-builder/Dockerfile → extra/docker/flatc-builder/Dockerfile b/docker/flatc-builder/Dockerfile → extra/docker/flatc-builder/Dockerfile
diff --git a/docker/gcc-builder/Dockerfile → extra/docker/gcc-builder/Dockerfile b/docker/gcc-builder/Dockerfile → extra/docker/gcc-builder/Dockerfile
diff --git a/docker/python-builder/Dockerfile → extra/docker/python-builder/Dockerfile b/docker/python-builder/Dockerfile → extra/docker/python-builder/Dockerfile
diff --git a/docker/python-builder/pip.conf → extra/docker/python-builder/pip.conf b/docker/python-builder/pip.conf → extra/docker/python-builder/pip.conf
diff --git 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: