From b402b1f1b3456b322dc5e19fecaf08626a2b0a93 Mon Sep 17 00:00:00 2001 From: Eli Byrd Date: Tue, 5 Sep 2023 15:19:10 -0500 Subject: [PATCH 1/2] Change how timezone is set --- .devcontainer/Dockerfile_Focal | 12 +++++++----- .devcontainer/Dockerfile_Jammy | 9 +++++++-- .devcontainer/Dockerfile_JetPack | 12 +++++++----- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/.devcontainer/Dockerfile_Focal b/.devcontainer/Dockerfile_Focal index c7732bc2..d0df97f6 100644 --- a/.devcontainer/Dockerfile_Focal +++ b/.devcontainer/Dockerfile_Focal @@ -18,12 +18,13 @@ ARG CMAKE_VERSION="3.24.3" ARG OPENCV_VERSION="4.8.0" ARG QUILL_VERSION="v3.3.1" ARG GTEST_VERSION="v1.14.0" +ARG TZ="America/Chicago" # Set Labels LABEL authors="Missouri S&T Mars Rover Design Team" LABEL maintainer="Mars Rover Design Team " LABEL org.opencontainers.image.source=https://github.com/missourimrdt/autonomy_software -LABEL org.opencontainers.image.licenses=GPL-3.0-onlyLABEL +LABEL org.opencontainers.image.licenses=GPL-3.0-only LABEL org.opencontainers.image.version="v24.1.0" LABEL org.opencontainers.image.description="Docker Image for Ubuntu ${UBUNTU_MAJOR}.${UBUNTU_MINOR} with CUDA ${CUDA_MAJOR}.${CUDA_MINOR}, ZED SDK ${ZED_MAJOR}.${ZED_MINOR}, OpenCV ${OPENCV_VERSION}, Quill ${QUILL_VERSION}, and Google Test ${GTEST_VERSION}." @@ -34,9 +35,6 @@ ARG DEBIAN_FRONTEND=noninteractive ENV NVIDIA_DRIVER_CAPABILITIES \ ${NVIDIA_DRIVER_CAPABILITIES:+$NVIDIA_DRIVER_CAPABILITIES,}compute,video,utility,graphics -# Set Timezone -RUN echo "America/Chicago" > /etc/localtime - # Set CUDA Version RUN echo "CUDA Version ${CUDA_MAJOR}.${CUDA_MINOR}.0" > /usr/local/cuda/version.txt @@ -47,12 +45,16 @@ RUN apt-get update && apt-get install --no-install-recommends -y \ libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev tzdata curl \ yasm libatlas-base-dev gfortran libpq-dev libavutil-dev libpostproc-dev \ libxine2-dev libglew-dev libtiff5-dev zlib1g-dev cowsay locales \ - libeigen3-dev python3-dev python3-pip python3-numpy libx11-dev \ + libeigen3-dev python3-dev python3-pip python3-numpy libx11-dev tzdata \ libboost-all-dev valgrind doxygen graphviz htop nano fortune fortunes # Install Required Python Packages RUN python3 -m pip install numpy opencv-python pyopengl +# Set Timezone +RUN echo "${TZ}" > /etc/localtime && \ + echo "${TZ}" > /etc/timezone + # Install gcc/g++ RUN apt-get install --no-install-recommends -y \ gcc-10 g++-10 && \ diff --git a/.devcontainer/Dockerfile_Jammy b/.devcontainer/Dockerfile_Jammy index 973bbf4b..2dd29592 100644 --- a/.devcontainer/Dockerfile_Jammy +++ b/.devcontainer/Dockerfile_Jammy @@ -18,12 +18,13 @@ ARG CMAKE_VERSION="3.24.3" ARG OPENCV_VERSION="4.8.0" ARG QUILL_VERSION="v3.3.1" ARG GTEST_VERSION="v1.14.0" +ARG TZ="America/Chicago" # Set Labels LABEL authors="Missouri S&T Mars Rover Design Team" LABEL maintainer="Mars Rover Design Team " LABEL org.opencontainers.image.source=https://github.com/missourimrdt/autonomy_software -LABEL org.opencontainers.image.licenses=GPL-3.0-onlyLABEL +LABEL org.opencontainers.image.licenses=GPL-3.0-only LABEL org.opencontainers.image.version="v24.1.0" LABEL org.opencontainers.image.description="Docker Image for Ubuntu ${UBUNTU_MAJOR}.${UBUNTU_MINOR} with CUDA ${CUDA_MAJOR}.${CUDA_MINOR}, ZED SDK ${ZED_MAJOR}.${ZED_MINOR}, OpenCV ${OPENCV_VERSION}, Quill ${QUILL_VERSION}, and Google Test ${GTEST_VERSION}." @@ -47,12 +48,16 @@ RUN apt-get update && apt-get install --no-install-recommends -y \ libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev tzdata curl \ yasm libatlas-base-dev gfortran libpq-dev libavutil-dev libpostproc-dev \ libxine2-dev libglew-dev libtiff5-dev zlib1g-dev cowsay locales \ - libeigen3-dev python3-dev python3-pip python3-numpy libx11-dev \ + libeigen3-dev python3-dev python3-pip python3-numpy libx11-dev tzdata \ libboost-all-dev valgrind doxygen graphviz htop nano fortune fortunes # Install Required Python Packages RUN python3 -m pip install numpy opencv-python pyopengl +# Set Timezone +RUN echo "${TZ}" > /etc/localtime && \ + echo "${TZ}" > /etc/timezone + # Install gcc/g++ RUN apt-get install --no-install-recommends -y \ gcc-10 g++-10 && \ diff --git a/.devcontainer/Dockerfile_JetPack b/.devcontainer/Dockerfile_JetPack index 4cb27019..a9035991 100644 --- a/.devcontainer/Dockerfile_JetPack +++ b/.devcontainer/Dockerfile_JetPack @@ -18,6 +18,7 @@ ARG CMAKE_VERSION="3.24.3" ARG OPENCV_VERSION="4.8.0" ARG QUILL_VERSION="v3.3.1" ARG GTEST_VERSION="v1.14.0" +ARG TZ="America/Chicago" # Set Labels LABEL authors="Missouri S&T Mars Rover Design Team" @@ -33,9 +34,6 @@ ARG DEBIAN_FRONTEND=noninteractive # Set Jetson Streaming Evironment Variables ENV LOGNAME root -# Set Timezone -RUN echo "America/Chicago" > /etc/localtime - # Set L4T Version RUN echo "# R${L4T_MAJOR} (release), REVISION: ${L4T_MINOR}.${L4T_PATCH}" > /etc/nv_tegra_release @@ -44,15 +42,19 @@ RUN apt-get update && apt-get install --no-install-recommends -y \ build-essential gfortran cmake git gdb file tar libatlas-base-dev apt-transport-https \ libavcodec-dev libavformat-dev libavresample-dev libcanberra-gtk3-module zstd wget less \ libdc1394-22-dev libeigen3-dev libglew-dev libgstreamer-plugins-base1.0-dev udev curl \ - libgstreamer-plugins-good1.0-dev libgstreamer1.0-dev libgtk-3-dev libjpeg-dev sudo \ + libgstreamer-plugins-good1.0-dev libgstreamer1.0-dev libgtk-3-dev libjpeg-dev sudo tzdata \ libjpeg8-dev libjpeg-turbo8-dev liblapack-dev liblapacke-dev libopenblas-dev libpng-dev \ libpostproc-dev libswscale-dev libtbb-dev libtbb2 libtesseract-dev libtiff-dev libv4l-dev \ libxine2-dev libxvidcore-dev libx264-dev libgtkglext1 libgtkglext1-dev pkg-config qv4l2 \ v4l-utils zlib1g-dev python3-dev python-numpy libboost-all-dev valgrind doxygen graphviz nano -#This symbolic link is needed to use the streaming features on Jetson inside a container +# This symbolic link is needed to use the streaming features on Jetson inside a container RUN ln -sf /usr/lib/aarch64-linux-gnu/tegra/libv4l2.so.0 /usr/lib/aarch64-linux-gnu/libv4l2.so +# Set Timezone +RUN echo "${TZ}" > /etc/localtime && \ + echo "${TZ}" > /etc/timezone + # Install gcc/g++ RUN apt-get install --no-install-recommends -y \ gcc-10 g++-10 && \ From af478e73ef9b559883777d8e41fb91446d38463d Mon Sep 17 00:00:00 2001 From: Eli Byrd Date: Tue, 5 Sep 2023 16:33:44 -0500 Subject: [PATCH 2/2] Change Sub Pages Names --- CONTRIBUTING.md | 2 +- INSTALL.md | 2 +- docs/Doxygen/resources/DoxygenLayout.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 362a87e1..85918b6c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ -\page CONTRIBUTING_8md Contributing Guide +\page md_CONTRIBUTING Contributing Guide # Contributing to Autonomy Software ## Contributing diff --git a/INSTALL.md b/INSTALL.md index 86855f92..873f4b59 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,4 +1,4 @@ -\page INSTALL_8md Installation Guide +\page md_INSTALL Installation Guide # Installing Autonomy Software diff --git a/docs/Doxygen/resources/DoxygenLayout.xml b/docs/Doxygen/resources/DoxygenLayout.xml index 0ee3a432..f025da44 100644 --- a/docs/Doxygen/resources/DoxygenLayout.xml +++ b/docs/Doxygen/resources/DoxygenLayout.xml @@ -3,8 +3,8 @@ - - + +