Relocate dockerfiles to extra folder.

Signed-off-by: Rule Timothy (CC/EMT2) <[email protected]>
boschglobal · Nov 29, 2023 · 34f5cab · 34f5cab
1 parent 08b80f4
commit 34f5cab
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -226,7 +226,7 @@ jobs:
         with:
           push: true
           context: .
-          file: ./docker/${{ matrix.name }}/Dockerfile
+          file: ./extra/docker/${{ matrix.name }}/Dockerfile
           build-args: |
              PACKAGE_VERSION=${{ env.PACKAGE_VERSION }}
           tags: ${{ steps.meta.outputs.tags }}

diff --git a/Makefile b/Makefile
@@ -117,7 +117,7 @@ package:
 docker: build
 	for d in $(DOCKER_DIRS) ;\
 	do \
-		docker build -f docker/$$d/Dockerfile \
+		docker build -f extra/docker/$$d/Dockerfile \
 				--tag $$d:test . ;\
 	done;
 

diff --git a/docker/modelc-x86/Dockerfile → extra/docker/modelc-x86/Dockerfile b/docker/modelc-x86/Dockerfile → extra/docker/modelc-x86/Dockerfile
@@ -57,7 +57,7 @@ RUN dpkg --add-architecture i386; \
 # =========================================
 COPY dse/modelc/build/_out/bin/modelc /usr/local/bin/modelc
 COPY dse/modelc/build/_out/lib/mcl_model.so /usr/local/lib/mcl_model.so
-COPY docker/modelc/modelc_runner.sh /modelc_runner.sh
+COPY extra/docker/modelc/modelc_runner.sh /modelc_runner.sh
 RUN chmod +x /modelc_runner.sh
 
 

diff --git a/docker/modelc-x86/modelc_runner.sh → extra/docker/modelc-x86/modelc_runner.sh b/docker/modelc-x86/modelc_runner.sh → extra/docker/modelc-x86/modelc_runner.sh
diff --git a/docker/modelc/Dockerfile → extra/docker/modelc/Dockerfile b/docker/modelc/Dockerfile → extra/docker/modelc/Dockerfile
@@ -54,7 +54,7 @@ RUN apt-get -y update; \
 # =========================================
 COPY dse/modelc/build/_out/bin/modelc /usr/local/bin/modelc
 COPY dse/modelc/build/_out/lib/mcl_model.so /usr/local/lib/mcl_model.so
-COPY docker/modelc/modelc_runner.sh /modelc_runner.sh
+COPY extra/docker/modelc/modelc_runner.sh /modelc_runner.sh
 RUN chmod +x /modelc_runner.sh
 
 

diff --git a/docker/modelc/modelc_runner.sh → extra/docker/modelc/modelc_runner.sh b/docker/modelc/modelc_runner.sh → extra/docker/modelc/modelc_runner.sh
diff --git a/docker/simbus-sa/Dockerfile → extra/docker/simbus-sa/Dockerfile b/docker/simbus-sa/Dockerfile → extra/docker/simbus-sa/Dockerfile
@@ -50,7 +50,7 @@ RUN apt-get -y update; \
 # Install the SimBus and Runner
 # =============================
 COPY dse/modelc/build/_out/bin/simbus /usr/local/bin/simbus
-COPY docker/simbus-sa/simbus_runner.sh /simbus_runner.sh
+COPY extra/docker/simbus-sa/simbus_runner.sh /simbus_runner.sh
 RUN chmod +x /simbus_runner.sh
 
 

diff --git a/docker/simbus-sa/simbus_runner.sh → extra/docker/simbus-sa/simbus_runner.sh b/docker/simbus-sa/simbus_runner.sh → extra/docker/simbus-sa/simbus_runner.sh