Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit d63ab93

Browse files
youtalkyoutalk
committedOct 23, 2024·
fix rebase
Signed-off-by: Yutaka Kondo <yutaka.kondo@youtalk.jp>
1 parent b22a9c7 commit d63ab93

File tree

5 files changed

+39
-176
lines changed

5 files changed

+39
-176
lines changed
 

‎.github/actions/docker-build-and-push-cuda/action.yaml

-123
This file was deleted.

‎.github/actions/docker-build-and-push/action.yaml

+5-13
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ runs:
100100
flavor: |
101101
latest=false
102102
103-
<<<<<<< HEAD
104103
- name: Docker meta for autoware:universe-sensing-perception-devel-cuda
105104
id: meta-universe-sensing-perception-devel-cuda
106105
uses: docker/metadata-action@v5
@@ -113,8 +112,6 @@ runs:
113112
flavor: |
114113
latest=false
115114
116-
=======
117-
>>>>>>> 3f6461b (Revert "integrate")
118115
- name: Docker meta for autoware:universe-sensing-perception
119116
id: meta-universe-sensing-perception
120117
uses: docker/metadata-action@v5
@@ -127,7 +124,6 @@ runs:
127124
flavor: |
128125
latest=false
129126
130-
<<<<<<< HEAD
131127
- name: Docker meta for autoware:universe-sensing-perception-cuda
132128
id: meta-universe-sensing-perception-cuda
133129
uses: docker/metadata-action@v5
@@ -140,8 +136,6 @@ runs:
140136
flavor: |
141137
latest=false
142138
143-
=======
144-
>>>>>>> 3f6461b (Revert "integrate")
145139
- name: Docker meta for autoware:universe-localization-mapping-devel
146140
id: meta-universe-localization-mapping-devel
147141
uses: docker/metadata-action@v5
@@ -226,7 +220,6 @@ runs:
226220
flavor: |
227221
latest=false
228222
229-
<<<<<<< HEAD
230223
- name: Docker meta for autoware:universe-devel-cuda
231224
id: meta-universe-devel-cuda
232225
uses: docker/metadata-action@v5
@@ -239,8 +232,6 @@ runs:
239232
flavor: |
240233
latest=false
241234
242-
=======
243-
>>>>>>> 3f6461b (Revert "integrate")
244235
- name: Docker meta for autoware:universe
245236
id: meta-universe
246237
uses: docker/metadata-action@v5
@@ -253,7 +244,6 @@ runs:
253244
flavor: |
254245
latest=auto
255246
256-
<<<<<<< HEAD
257247
- name: Docker meta for autoware:universe-cuda
258248
id: meta-universe-cuda
259249
uses: docker/metadata-action@v5
@@ -266,9 +256,7 @@ runs:
266256
flavor: |
267257
latest=auto
268258
269-
=======
270-
>>>>>>> 3f6461b (Revert "integrate")
271-
- name: Login to Docker Hub
259+
- name: Login to GitHub Container Registry
272260
uses: docker/login-action@v3
273261
with:
274262
registry: ghcr.io
@@ -284,15 +272,19 @@ runs:
284272
${{ steps.meta-base.outputs.bake-file }}
285273
${{ steps.meta-core-devel.outputs.bake-file }}
286274
${{ steps.meta-universe-sensing-perception-devel.outputs.bake-file }}
275+
${{ steps.meta-universe-sensing-perception-devel-cuda.outputs.bake-file }}
287276
${{ steps.meta-universe-sensing-perception.outputs.bake-file }}
277+
${{ steps.meta-universe-sensing-perception-cuda.outputs.bake-file }}
288278
${{ steps.meta-universe-localization-mapping-devel.outputs.bake-file }}
289279
${{ steps.meta-universe-localization-mapping.outputs.bake-file }}
290280
${{ steps.meta-universe-planning-control-devel.outputs.bake-file }}
291281
${{ steps.meta-universe-planning-control.outputs.bake-file }}
292282
${{ steps.meta-universe-vehicle-system-devel.outputs.bake-file }}
293283
${{ steps.meta-universe-vehicle-system.outputs.bake-file }}
294284
${{ steps.meta-universe-devel.outputs.bake-file }}
285+
${{ steps.meta-universe-devel-cuda.outputs.bake-file }}
295286
${{ steps.meta-universe.outputs.bake-file }}
287+
${{ steps.meta-universe-cuda.outputs.bake-file }}
296288
provenance: false
297289
set: |
298290
${{ inputs.build-args }}

‎.github/workflows/health-check.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
docker-build:
2828
needs: load-env
29-
runs-on: buildjet-16vcpu-ubuntu-2204
29+
runs-on: ubuntu-22.04
3030
strategy:
3131
fail-fast: false
3232
steps:

‎docker/docker-bake-cuda.hcl

-38
This file was deleted.

‎docker/docker-bake.hcl

+33-1
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,39 @@ group "default" {
33
"base",
44
"core-devel",
55
"universe-sensing-perception-devel",
6+
"universe-sensing-perception-devel-cuda",
67
"universe-sensing-perception",
8+
"universe-sensing-perception-cuda",
79
"universe-localization-mapping-devel",
810
"universe-localization-mapping",
911
"universe-planning-control-devel",
1012
"universe-planning-control",
1113
"universe-vehicle-system-devel",
1214
"universe-vehicle-system",
1315
"universe-devel",
14-
"universe"
16+
"universe-devel-cuda",
17+
"universe",
18+
"universe-cuda"
1519
]
1620
}
1721

1822
// For docker/metadata-action
1923
target "docker-metadata-action-base" {}
2024
target "docker-metadata-action-core-devel" {}
2125
target "docker-metadata-action-universe-sensing-perception-devel" {}
26+
target "docker-metadata-action-universe-sensing-perception-devel-cuda" {}
2227
target "docker-metadata-action-universe-sensing-perception" {}
28+
target "docker-metadata-action-universe-sensing-perception-cuda" {}
2329
target "docker-metadata-action-universe-localization-mapping-devel" {}
2430
target "docker-metadata-action-universe-localization-mapping" {}
2531
target "docker-metadata-action-universe-planning-control-devel" {}
2632
target "docker-metadata-action-universe-planning-control" {}
2733
target "docker-metadata-action-universe-vehicle-system-devel" {}
2834
target "docker-metadata-action-universe-vehicle-system" {}
2935
target "docker-metadata-action-universe-devel" {}
36+
target "docker-metadata-action-universe-devel-cuda" {}
3037
target "docker-metadata-action-universe" {}
38+
target "docker-metadata-action-universe-cuda" {}
3139

3240
target "base" {
3341
inherits = ["docker-metadata-action-base"]
@@ -47,12 +55,24 @@ target "universe-sensing-perception-devel" {
4755
target = "universe-sensing-perception-devel"
4856
}
4957

58+
target "universe-sensing-perception-devel-cuda" {
59+
inherits = ["docker-metadata-action-universe-sensing-perception-devel-cuda"]
60+
dockerfile = "docker/Dockerfile"
61+
target = "universe-sensing-perception-devel-cuda"
62+
}
63+
5064
target "universe-sensing-perception" {
5165
inherits = ["docker-metadata-action-universe-sensing-perception"]
5266
dockerfile = "docker/Dockerfile"
5367
target = "universe-sensing-perception"
5468
}
5569

70+
target "universe-sensing-perception-cuda" {
71+
inherits = ["docker-metadata-action-universe-sensing-perception-cuda"]
72+
dockerfile = "docker/Dockerfile"
73+
target = "universe-sensing-perception-cuda"
74+
}
75+
5676
target "universe-localization-mapping-devel" {
5777
inherits = ["docker-metadata-action-universe-localization-mapping-devel"]
5878
dockerfile = "docker/Dockerfile"
@@ -95,8 +115,20 @@ target "universe-devel" {
95115
target = "universe-devel"
96116
}
97117

118+
target "universe-devel-cuda" {
119+
inherits = ["docker-metadata-action-universe-devel-cuda"]
120+
dockerfile = "docker/Dockerfile"
121+
target = "universe-devel-cuda"
122+
}
123+
98124
target "universe" {
99125
inherits = ["docker-metadata-action-universe"]
100126
dockerfile = "docker/Dockerfile"
101127
target = "universe"
102128
}
129+
130+
target "universe-cuda" {
131+
inherits = ["docker-metadata-action-universe-cuda"]
132+
dockerfile = "docker/Dockerfile"
133+
target = "universe-cuda"
134+
}

0 commit comments

Comments
 (0)
Please sign in to comment.