Skip to content

Commit

Permalink
add tools dockerfile
Browse files Browse the repository at this point in the history
Signed-off-by: Oguz Ozturk <oguzkaganozt@gmail.com>
  • Loading branch information
oguzkaganozt committed Nov 18, 2024
1 parent de06b9e commit 890d5ad
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 24 deletions.
1 change: 1 addition & 0 deletions .github/actions/docker-build-and-push/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ runs:
run: |
mkdir src
vcs import src < autoware.repos
vcs import src < simulator.repos
shell: bash

- name: Setup Docker Buildx
Expand Down
50 changes: 26 additions & 24 deletions docker/visualizer.dockerfile → docker/tools/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
# Install all message types of autoware.universe
FROM ghcr.io/autowarefoundation/autoware:universe-devel AS builder

# Build tierIV simulator
COPY simulator.repos simulator.repos
RUN vcs import src < simulator.repos
# Copy scenario_simulator to src
COPY src/simulator/scenario_simulator/ /autoware/src/simulator/scenario_simulator/

# Set up rosdep
RUN --mount=type=ssh \
Expand All @@ -30,8 +29,8 @@ RUN find /opt/autoware/share -type f -name "*.py" -exec chmod +x {} \;

# simulator-visualizer
FROM ghcr.io/autowarefoundation/autoware:universe AS simulator-visualizer
COPY simulator.repos simulator.repos
RUN vcs import src < simulator.repos

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

# Set up rosdep
Expand All @@ -46,26 +45,29 @@ RUN --mount=type=ssh \

RUN echo "source /opt/autoware/setup.bash" >> /etc/bash.bashrc

# Install VNC server with NoVNC
RUN apt-get update && apt-get install -y \
tigervnc-standalone-server \
tigervnc-common \
novnc \
x11vnc \
xvfb \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
# # Install VNC server with NoVNC
# RUN apt-get update && apt-get install -y \
# tigervnc-standalone-server \

Check warning on line 50 in docker/tools/Dockerfile

View workflow job for this annotation

GitHub Actions / spell-check-differential

Unknown word (tigervnc)
# tigervnc-common \

Check warning on line 51 in docker/tools/Dockerfile

View workflow job for this annotation

GitHub Actions / spell-check-differential

Unknown word (tigervnc)
# novnc \

Check warning on line 52 in docker/tools/Dockerfile

View workflow job for this annotation

GitHub Actions / spell-check-differential

Unknown word (novnc)
# x11vnc \
# xvfb \
# && apt-get clean \
# && rm -rf /var/lib/apt/lists/*

# # Set up NoVNC according to https://github.com/novnc/noVNC/blob/master/docs/EMBEDDING.md

# Set up NoVNC according to https://github.com/novnc/noVNC/blob/master/docs/EMBEDDING.md
# # Set up VNC password
# RUN mkdir -p ~/.vnc && \
# echo "password" | vncpasswd -f > ~/.vnc/passwd && \

Check warning on line 62 in docker/tools/Dockerfile

View workflow job for this annotation

GitHub Actions / spell-check-differential

Unknown word (vncpasswd)
# chmod 600 ~/.vnc/passwd

# Set up VNC password
RUN mkdir -p ~/.vnc && \
echo "password" | vncpasswd -f > ~/.vnc/passwd && \
chmod 600 ~/.vnc/passwd
# # Set up startup script for VNC
# COPY scripts/start-vnc.sh /usr/local/bin/start-vnc
# RUN chmod +x /usr/local/bin/start-vnc

# Set up startup script for VNC
COPY scripts/start-vnc.sh /usr/local/bin/
RUN chmod +x /usr/local/bin/start-vnc.sh
# # Expose VNC and NoVNC ports
# EXPOSE 5900 6080

# Expose VNC and NoVNC ports
EXPOSE 5900 6080
# ENTRYPOINT ["/usr/local/bin/start-vnc"]
CMD ["/bin/bash"]

0 comments on commit 890d5ad

Please sign in to comment.