michael.katsoulis/WAR_exwayz3dm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix gui start, change docker container, add shell to start gui

Browse Source
This commit is contained in:
Michael Katsoulis
2026-01-12 10:53:32 +01:00
parent e97de16264
commit c286dafcf7
3 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
exwayz_test.dockerfile
View File

@@ -4,14 +4,23 @@ FROM ros:jazzy-ros-core
# Build argument provided by buildx/BuildKit: `TARGETARCH` (amd64, arm64, etc.).
# Default to amd64 when not provided.
ARG TARGETARCH=amd64
ARG GRAPICAL_ENV=TRUE
# Copy both architecture-specific packages into the image and choose the right one at build time
COPY pkgs/exwayz_3d_mapping-1.2.2-linux-u24.04-amd64.deb /tmp/exwayz_amd64.deb
COPY pkgs/exwayz_3d_mapping-1.2.2-linux-u24.04-aarch64.deb /tmp/exwayz_aarch64.deb
# Install dependencies and setup for GUI applications
ENV DISPLAY=:0
ENV WAYLAND_DISPLAY=wayland-0
ENV XDG_SESSION_TYPE=x11
ENV XDG_RUNTIME_DIR=/mnt/wslg/runtime-dir
#If debug, install the following:
RUN apt update && apt install -y libgl1-mesa-dev libosmesa6-dev libglew-dev libgles2-mesa-dev libglfw3-dev libstdc++6 mesa-utils
#TODO we're installing unneccessary things like the humanity-icons package, clean this up later.
RUN if [ "$GRAPHICAL_ENV" = "TRUE" ]; then \
apt update && apt install -y libgl1-mesa-dev libosmesa6-dev libglew-dev libgles2-mesa-dev libglfw3-dev libstdc++6 mesa-utils; \
fi
#TODO we're installing unneccessary things like the humanity-icons package, clean this up later.
# RUN --mount=type=secret,id=exwayz_license set -eux; \
# if [ "${TARGETARCH}" = "aarch64" ]; then \
@@ -27,18 +36,22 @@ RUN apt update && apt install -y libgl1-mesa-dev libosmesa6-dev libglew-dev libg
# rm -f /tmp/exwayz_amd64.deb /tmp/exwayz_aarch64.deb; \
# rm -rf /var/lib/apt/lists/*
RUN --mount=type=secret,id=exwayz_license set -eux; \
COPY licenses/exwayz_liscence.lic /tmp/exwayz_license
RUN set -eux; \
apt-get update; \
apt-get install -fy /tmp/exwayz_amd64.deb; \
if [ -s /run/secrets/exwayz_license ]; then \
exwayz_license --query "$(cat /run/secrets/exwayz_license)" || true; \
if [ -f /tmp/exwayz_license ]; then \
exwayz_license --query "$(cat /tmp/exwayz_license)" || true; \
else \
echo "No license file provided"; \
exit 1; \
fi; \
rm -f /tmp/exwayz_amd64.deb /tmp/exwayz_aarch64.deb; \
rm -f /tmp/exwayz_license; \
rm -rf /var/lib/apt/lists/*
# TODO verify license was applied successfully
# # Change the working directory to /app
# WORKDIR /app
# Set entrypoint
ENTRYPOINT ["/ros_entrypoint.sh"]