Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ghcr.io/autowarefoundation/autoware-openadk:latest-devel
ARG BASE_IMAGE
FROM $BASE_IMAGE

ENV SHELL /bin/bash

Expand Down
6 changes: 2 additions & 4 deletions .devcontainer/base/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
{
"name": "Autoware",
"build": {
"dockerfile": "Dockerfile"
"dockerfile": "../Dockerfile",
"args": { "BASE_IMAGE": "ghcr.io/autowarefoundation/autoware-openadk:latest-devel" }

Check warning on line 5 in .devcontainer/base/devcontainer.json

View workflow job for this annotation

GitHub Actions / spell-check-differential

Unknown word (openadk)
},
"remoteUser": "autoware",
"hostRequirements": {
"gpu": true
},
"runArgs": [
"--cap-add=SYS_PTRACE",

Check warning on line 9 in .devcontainer/base/devcontainer.json

View workflow job for this annotation

GitHub Actions / spell-check-differential

Unknown word (PTRACE)
"--security-opt",
"seccomp=unconfined",

Check warning on line 11 in .devcontainer/base/devcontainer.json

View workflow job for this annotation

GitHub Actions / spell-check-differential

Unknown word (seccomp)
"--net=host",
"--volume=/etc/localtime:/etc/localtime:ro"

Check warning on line 13 in .devcontainer/base/devcontainer.json

View workflow job for this annotation

GitHub Actions / spell-check-differential

Unknown word (localtime)

Check warning on line 13 in .devcontainer/base/devcontainer.json

View workflow job for this annotation

GitHub Actions / spell-check-differential

Unknown word (localtime)
],
"customizations": {
"vscode": {
Expand Down
14 changes: 0 additions & 14 deletions .devcontainer/cuda/Dockerfile

This file was deleted.

3 changes: 2 additions & 1 deletion .devcontainer/cuda/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
{
"name": "Autoware-cuda",
"build": {
"dockerfile": "Dockerfile"
"dockerfile": "../Dockerfile",
"args": { "BASE_IMAGE": "ghcr.io/autowarefoundation/autoware-openadk:latest-devel-cuda" }

Check warning on line 5 in .devcontainer/cuda/devcontainer.json

View workflow job for this annotation

GitHub Actions / spell-check-differential

Unknown word (openadk)
},
"remoteUser": "autoware",
"hostRequirements": {
"gpu": true
},
"runArgs": [
"--cap-add=SYS_PTRACE",

Check warning on line 12 in .devcontainer/cuda/devcontainer.json

View workflow job for this annotation

GitHub Actions / spell-check-differential

Unknown word (PTRACE)
"--security-opt",
"seccomp=unconfined",

Check warning on line 14 in .devcontainer/cuda/devcontainer.json

View workflow job for this annotation

GitHub Actions / spell-check-differential

Unknown word (seccomp)
"--net=host",
"--volume=/etc/localtime:/etc/localtime:ro",

Check warning on line 16 in .devcontainer/cuda/devcontainer.json

View workflow job for this annotation

GitHub Actions / spell-check-differential

Unknown word (localtime)

Check warning on line 16 in .devcontainer/cuda/devcontainer.json

View workflow job for this annotation

GitHub Actions / spell-check-differential

Unknown word (localtime)
"--gpus",
"all"
],
Expand Down
Loading