Skip to content

Commit

Permalink
.
Browse files Browse the repository at this point in the history
Signed-off-by: Oguz Ozturk <[email protected]>
  • Loading branch information
oguzkaganozt committed Nov 18, 2024
1 parent 890d5ad commit 5bfafee
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 4 deletions.
13 changes: 13 additions & 0 deletions .github/actions/docker-build-and-push/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,18 @@ runs:
flavor: |
latest=auto
- name: Docker meta for simulator-tools
id: meta-simulator-tools
uses: docker/metadata-action@v5
with:
images: ghcr.io/${{ github.repository_owner }}/simulator-tools
tags: |
type=raw,value=simulator-tools-${{ inputs.platform }}
type=raw,value=simulator-tools-${{ steps.date.outputs.date }}-${{ inputs.platform }}
bake-target: docker-metadata-action-simulator-tools
flavor: |
latest=false
- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
Expand All @@ -234,6 +246,7 @@ runs:
${{ steps.meta-universe-vehicle-system.outputs.bake-file }}
${{ steps.meta-universe-devel.outputs.bake-file }}
${{ steps.meta-universe.outputs.bake-file }}
${{ steps.meta-simulator-tools.outputs.bake-file }}
provenance: false
set: |
${{ inputs.build-args }}
11 changes: 9 additions & 2 deletions docker/docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ group "default" {
"universe-vehicle-system-devel",
"universe-vehicle-system",
"universe-devel",
"universe"
"universe",
"simulator-tools"
]
}

Expand All @@ -28,7 +29,7 @@ target "docker-metadata-action-universe-vehicle-system-devel" {}
target "docker-metadata-action-universe-vehicle-system" {}
target "docker-metadata-action-universe-devel" {}
target "docker-metadata-action-universe" {}

target "docker-metadata-action-simulator-tools" {}
target "base" {
inherits = ["docker-metadata-action-base"]
dockerfile = "docker/Dockerfile"
Expand Down Expand Up @@ -100,3 +101,9 @@ target "universe" {
dockerfile = "docker/Dockerfile"
target = "universe"
}

target "simulator-tools" {
inherits = ["docker-metadata-action-simulator-tools"]
dockerfile = "docker/tools/Dockerfile"
target = "simulator-tools"
}
4 changes: 2 additions & 2 deletions docker/tools/Dockerfile → docker/simulator-tools/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ RUN source /opt/ros/"$ROS_DISTRO"/setup.bash \
RUN find /opt/autoware/lib -type f -name "*.py" -exec chmod +x {} \;
RUN find /opt/autoware/share -type f -name "*.py" -exec chmod +x {} \;

# simulator-visualizer
FROM ghcr.io/autowarefoundation/autoware:universe AS simulator-visualizer
# simulator-tools
FROM ghcr.io/autowarefoundation/autoware:universe AS simulator-tools

COPY src/simulator/scenario_simulator/ /autoware/src/simulator/scenario_simulator/
COPY --from=builder /opt/autoware /opt/autoware
Expand Down

0 comments on commit 5bfafee

Please sign in to comment.