ci(devcontainers): create single dockerfile for devcontainers (#4525)

* Merge dockerfiles Signed-off-by: oguzkaganozt <[email protected]> * hadolint ignore Signed-off-by: Oguz Ozturk <[email protected]> --------- Signed-off-by: oguzkaganozt <[email protected]> Signed-off-by: Oguz Ozturk <[email protected]>
autowarefoundation · Mar 12, 2024 · e1a4269 · e1a4269
1 parent 117c633
commit e1a4269
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 20 deletions.
diff --git a/.devcontainer/base/Dockerfile → .devcontainer/Dockerfile b/.devcontainer/base/Dockerfile → .devcontainer/Dockerfile
@@ -1,4 +1,6 @@
-FROM ghcr.io/autowarefoundation/autoware-openadk:latest-devel
+# hadolint global ignore=DL3006
+ARG BASE_IMAGE
+FROM $BASE_IMAGE
 
 ENV SHELL /bin/bash
 

diff --git a/.devcontainer/base/devcontainer.json b/.devcontainer/base/devcontainer.json
@@ -1,12 +1,10 @@
 {
   "name": "Autoware",
   "build": {
-    "dockerfile": "Dockerfile"
+    "dockerfile": "../Dockerfile",
+    "args": { "BASE_IMAGE": "ghcr.io/autowarefoundation/autoware-openadk:latest-devel" }
   },
   "remoteUser": "autoware",
-  "hostRequirements": {
-    "gpu": true
-  },
   "runArgs": [
     "--cap-add=SYS_PTRACE",
     "--security-opt",

diff --git a/.devcontainer/cuda/Dockerfile b/.devcontainer/cuda/Dockerfile
diff --git a/.devcontainer/cuda/devcontainer.json b/.devcontainer/cuda/devcontainer.json
@@ -1,7 +1,8 @@
 {
   "name": "Autoware-cuda",
   "build": {
-    "dockerfile": "Dockerfile"
+    "dockerfile": "../Dockerfile",
+    "args": { "BASE_IMAGE": "ghcr.io/autowarefoundation/autoware-openadk:latest-devel-cuda" }
   },
   "remoteUser": "autoware",
   "hostRequirements": {