Skip to content

Commit 5d31421

Browse files
authored
Remove default ubuntu user in Lunar/Noble (#373)
1 parent 5418952 commit 5d31421

File tree

2 files changed

+33
-30
lines changed

2 files changed

+33
-30
lines changed

image/.devcontainer/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ FROM ${BASE}
33

44
ARG RAPIDS_VERSION
55
ENV RAPIDS_VERSION=$RAPIDS_VERSION
6+
7+
RUN if grep ubuntu:x:1000:1000 /etc/passwd >/dev/null; then userdel -f -r ubuntu; fi

matrix.yml

+31-30
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ x-llvm-15: &llvm_15 { name: "llvm", version: "15" }
2727
x-llvm-16: &llvm_16 { name: "llvm", version: "16" }
2828
x-llvm-17: &llvm_17 { name: "llvm", version: "17" }
2929
x-llvm-prev: &llvm_18 { name: "llvm", version: "18" }
30-
x-llvm-curr: &llvm_19 { name: "llvm", version: "19" }
30+
# x-llvm-curr: &llvm_19 { name: "llvm", version: "19" }
3131
x-llvm-env: &llvm_env {CC: "clang", CXX: "clang++", CUDAHOSTCXX: "clang++"}
3232

3333
x-nvhpc-prev: &nvhpc_prev { name: "nvhpc", version: "24.3" }
@@ -42,6 +42,7 @@ x-openmpi: &openmpi {name: "openmpi"}
4242

4343
x-cccl-dev: &cccl_dev { name: "cccl-dev", hide: true }
4444
x-clangd-dev: &clangd_dev {name: "llvm", version: "19", packages: "clangd", hide: true}
45+
x-clangd-dev-jammy: &clangd_dev_jammy {name: "llvm", version: "dev", packages: "clangd", hide: true}
4546
x-clang-format-cccl: &clang_format_cccl {name: "llvm", version: "18", packages: "clang-format", hide: true}
4647
x-clang-format-rapids: &clang_format_rapids {name: "llvm", version: "16", packages: "clang-format", hide: true}
4748

@@ -93,31 +94,31 @@ include:
9394

9495
- os: "ubuntu:22.04"
9596
images:
96-
- {features: [*python, *nvhpc_prev, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *nvhpc_env}
97-
- {features: [*python, *nvhpc_curr, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *nvhpc_env}
98-
- {features: [*python, *gcc_11, {<<: *cuda_prev_max, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env}
99-
- {features: [*python, *gcc_11, {<<: *cuda_curr_min, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env}
100-
- {features: [*python, *gcc_11, {<<: *cuda_curr_max, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env}
101-
- {features: [*python, *gcc_12, {<<: *cuda_curr_min, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env}
102-
- {features: [*python, *gcc_12, {<<: *cuda_curr_max, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env}
103-
- {features: [*python, *gcc_13, {<<: *cuda_curr_min, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env}
104-
- {features: [*python, *gcc_13, {<<: *cuda_curr_max, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env}
105-
- {features: [*python, *llvm_15, {<<: *cuda_curr_min, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *llvm_env}
106-
- {features: [*python, *llvm_15, {<<: *cuda_curr_max, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *llvm_env}
107-
- {features: [*python, *llvm_16, {<<: *cuda_curr_min, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *llvm_env}
108-
- {features: [*python, *llvm_16, {<<: *cuda_curr_max, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *llvm_env}
109-
- {features: [*python, *llvm_17, {<<: *cuda_curr_min, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *llvm_env}
110-
- {features: [*python, *llvm_17, {<<: *cuda_curr_max, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *llvm_env}
111-
- {features: [*python, *llvm_18, {<<: *cuda_curr_min, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *llvm_env}
112-
- {features: [*python, *llvm_18, {<<: *cuda_curr_max, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *llvm_env}
113-
- {features: [*python, *llvm_19, {<<: *cuda_curr_min, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *llvm_env}
114-
- {features: [*python, *llvm_19, {<<: *cuda_curr_max, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *llvm_env}
115-
- {features: [*python, *oneapi_2022, {<<: *cuda_curr_max, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *onapi_env}
97+
- {features: [*python, *nvhpc_prev, *clang_format_cccl, *clangd_dev_jammy, *cccl_dev], env: *nvhpc_env}
98+
- {features: [*python, *nvhpc_curr, *clang_format_cccl, *clangd_dev_jammy, *cccl_dev], env: *nvhpc_env}
99+
- {features: [*python, *gcc_11, {<<: *cuda_prev_max, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev_jammy, *cccl_dev], env: *gcc_env}
100+
- {features: [*python, *gcc_11, {<<: *cuda_curr_min, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev_jammy, *cccl_dev], env: *gcc_env}
101+
- {features: [*python, *gcc_11, {<<: *cuda_curr_max, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev_jammy, *cccl_dev], env: *gcc_env}
102+
- {features: [*python, *gcc_12, {<<: *cuda_curr_min, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev_jammy, *cccl_dev], env: *gcc_env}
103+
- {features: [*python, *gcc_12, {<<: *cuda_curr_max, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev_jammy, *cccl_dev], env: *gcc_env}
104+
- {features: [*python, *gcc_13, {<<: *cuda_curr_min, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev_jammy, *cccl_dev], env: *gcc_env}
105+
- {features: [*python, *gcc_13, {<<: *cuda_curr_max, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev_jammy, *cccl_dev], env: *gcc_env}
106+
- {features: [*python, *llvm_15, {<<: *cuda_curr_min, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev_jammy, *cccl_dev], env: *llvm_env}
107+
- {features: [*python, *llvm_15, {<<: *cuda_curr_max, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev_jammy, *cccl_dev], env: *llvm_env}
108+
- {features: [*python, *llvm_16, {<<: *cuda_curr_min, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev_jammy, *cccl_dev], env: *llvm_env}
109+
- {features: [*python, *llvm_16, {<<: *cuda_curr_max, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev_jammy, *cccl_dev], env: *llvm_env}
110+
- {features: [*python, *llvm_17, {<<: *cuda_curr_min, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev_jammy, *cccl_dev], env: *llvm_env}
111+
- {features: [*python, *llvm_17, {<<: *cuda_curr_max, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev_jammy, *cccl_dev], env: *llvm_env}
112+
- {features: [*python, *llvm_18, {<<: *cuda_curr_min, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev_jammy, *cccl_dev], env: *llvm_env}
113+
- {features: [*python, *llvm_18, {<<: *cuda_curr_max, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev_jammy, *cccl_dev], env: *llvm_env}
114+
# - {features: [*python, *llvm_19, {<<: *cuda_curr_min, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev_jammy, *cccl_dev], env: *llvm_env}
115+
# - {features: [*python, *llvm_19, {<<: *cuda_curr_max, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev_jammy, *cccl_dev], env: *llvm_env}
116+
- {features: [*python, *oneapi_2022, {<<: *cuda_curr_max, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev_jammy, *cccl_dev], env: *onapi_env}
116117

117118
# Hack for getting gcc-13.2
118119
- os: "ubuntu:23.04"
119120
images:
120-
- {features: [*python, *gcc_13, {<<: *cuda_curr_max, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env}
121+
- {features: [*python, *gcc_13, {<<: *cuda_curr_max, <<: *cccl_cuda_opts}, *clang_format_cccl, *clangd_dev_jammy, *cccl_dev], env: *gcc_env}
121122

122123
- os: "windows"
123124
images:
@@ -147,14 +148,14 @@ include:
147148
- os: "ubuntu:22.04"
148149
images:
149150
# cuda
150-
- {features: [*python, *clang_format_rapids, *clangd_dev, *cuda_prev_max], env: *gcc_env}
151-
- {features: [*python, *clang_format_rapids, *clangd_dev, *cuda_curr_min], env: *gcc_env}
152-
- {features: [*python, *clang_format_rapids, *clangd_dev, *cuda_curr_max], env: *gcc_env}
153-
- {features: [*python, *clang_format_rapids, *clangd_dev, *cuda_curr_max_rapids], env: *gcc_env}
154-
- {features: [*python, *clang_format_rapids, *clangd_dev, *cuda_prev_max, *ucx_rapids, *openmpi], env: *gcc_env}
155-
- {features: [*python, *clang_format_rapids, *clangd_dev, *cuda_curr_min, *ucx_rapids, *openmpi], env: *gcc_env}
156-
- {features: [*python, *clang_format_rapids, *clangd_dev, *cuda_curr_max, *ucx_rapids, *openmpi], env: *gcc_env}
157-
- {features: [*python, *clang_format_rapids, *clangd_dev, *cuda_curr_max_rapids, *ucx_rapids, *openmpi], env: *gcc_env}
151+
- {features: [*python, *clang_format_rapids, *clangd_dev_jammy, *cuda_prev_max], env: *gcc_env}
152+
- {features: [*python, *clang_format_rapids, *clangd_dev_jammy, *cuda_curr_min], env: *gcc_env}
153+
- {features: [*python, *clang_format_rapids, *clangd_dev_jammy, *cuda_curr_max], env: *gcc_env}
154+
- {features: [*python, *clang_format_rapids, *clangd_dev_jammy, *cuda_curr_max_rapids], env: *gcc_env}
155+
- {features: [*python, *clang_format_rapids, *clangd_dev_jammy, *cuda_prev_max, *ucx_rapids, *openmpi], env: *gcc_env}
156+
- {features: [*python, *clang_format_rapids, *clangd_dev_jammy, *cuda_curr_min, *ucx_rapids, *openmpi], env: *gcc_env}
157+
- {features: [*python, *clang_format_rapids, *clangd_dev_jammy, *cuda_curr_max, *ucx_rapids, *openmpi], env: *gcc_env}
158+
- {features: [*python, *clang_format_rapids, *clangd_dev_jammy, *cuda_curr_max_rapids, *ucx_rapids, *openmpi], env: *gcc_env}
158159

159160
# mambaforge
160161
- features: [*conda]

0 commit comments

Comments
 (0)