Move tools/ -> docker/

DiamondLightSource · Oct 5, 2022 · 7427ddc · 7427ddc
1 parent a678887
commit 7427ddc
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -12,25 +12,25 @@
         {
             "label": "Test x86 hello world",
             "type": "shell",
-            "command": "cd ${workspaceFolder}/tools && mkdir -p build && g++ hello.cpp -o build/hello_x86 && ./build/hello_x86",
+            "command": "cd ${workspaceFolder}/docker && mkdir -p build && g++ hello.cpp -o build/hello_x86 && ./build/hello_x86",
             "problemMatcher": []
         },
         {
             "label": "Build ARM container",
             "type": "shell",
-            "command": "cd ${workspaceFolder}/tools && podman build --tag arm-crosscompiler .",
+            "command": "cd ${workspaceFolder}/docker && podman build --tag arm-crosscompiler .",
             "problemMatcher": []
         },
         {
             "label": "Test ARM hello world",
             "type": "shell",
-            "command": "${workspaceFolder}/tools/run_arm_container.sh",
+            "command": "${workspaceFolder}/docker/run_arm_container.sh",
             "problemMatcher": []
         },
         {
             "label": "Run command in ARM container",
             "type": "shell",
-            "command": "${workspaceFolder}/tools/run_arm_container.sh ${input:command}",
+            "command": "${workspaceFolder}/docker/run_arm_container.sh ${input:command}",
             "problemMatcher": []
         },
     ],

diff --git a/tools/Dockerfile → docker/Dockerfile b/tools/Dockerfile → docker/Dockerfile
diff --git a/tools/hello.cpp → docker/hello.cpp b/tools/hello.cpp → docker/hello.cpp
diff --git a/tools/run_arm_container.sh → docker/run_arm_container.sh b/tools/run_arm_container.sh → docker/run_arm_container.sh
diff --git a/docs/how-to/development/ppmac_deploy.md b/docs/how-to/development/ppmac_deploy.md
@@ -17,7 +17,7 @@ $ make install
 
 ## Building pmacFilterControl for ppmac
 
-A docker container is defined in `tools/Dockerfile` to provide a cross-compiling
+A docker container is defined in `docker/Dockerfile` to provide a cross-compiling
 toolchain for ARM. This can be used to build pmacFilterControl for the ppmac. There are
 vscode tasks to build the container itself and for running commands inside the
 container.