Merge pull request #34 from CDOT-CV/refactor/docker-modifications

Modifying dockerfiles & .devcontainer
CDOT-CV · Oct 30, 2023 · fc49b6f · fc49b6f
2 parents d1ae139 + c7d454f
commit fc49b6f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -19,13 +19,6 @@
 		"ms-vscode.cmake-tools"
 	],
 
-	"features": {
-		"docker-from-docker": {
-			"version": "latest",
-			"moby": true
-		}
-	},
-
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [],
 

diff --git a/Dockerfile b/Dockerfile
@@ -37,5 +37,5 @@ RUN export LD_LIBRARY_PATH=/usr/local/lib && mkdir /cvdi-stream-build && cd /cvd
 ADD ./docker-test /cvdi-stream/docker-test
 
 # Run the tool.
-RUN chmod 7777 /cvdi-stream/docker-test/ppm_no_map.sh
+RUN chmod 777 /cvdi-stream/docker-test/ppm_no_map.sh
 CMD ["/cvdi-stream/docker-test/ppm_no_map.sh"]
diff --git a/Dockerfile.testing b/Dockerfile.testing
@@ -34,5 +34,5 @@ RUN export LD_LIBRARY_PATH=/usr/local/lib && mkdir /cvdi-stream-build && cd /cvd
 ADD ./docker-test /cvdi-stream/docker-test
 
 # Run the tool.
-RUN chmod 7777 /cvdi-stream/docker-test/ppm_no_map.sh
+RUN chmod 777 /cvdi-stream/docker-test/ppm_no_map.sh
 CMD ["/cvdi-stream/docker-test/ppm_no_map.sh"]