fix: Update Dockerfile to use CMake version 3.23.2 and change contain…

…er username to 'dev'
entelecheia · May 11, 2024 · 9f0a9e2 · 9f0a9e2
1 parent 6146bb5
commit 9f0a9e2
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/.copier-docker-config.foxy-dsr.yaml b/.copier-docker-config.foxy-dsr.yaml
@@ -12,7 +12,7 @@ cuda_device_id: all
 docker_apt_packages: ''
 docker_build_from: ghcr.io/entelecheia/ros2:latest-foxy
 docker_container_uid: 8001
-docker_container_username: app
+docker_container_username: dev
 docker_image_variant_name: foxy-dsr
 docker_image_version_variable_name: IMAGE_VERSION
 docker_name_prefix: ROS2

diff --git a/.copier-docker-config.yaml b/.copier-docker-config.yaml
@@ -12,7 +12,7 @@ cuda_device_id: all
 docker_apt_packages: ''
 docker_build_from: ghcr.io/entelecheia/ros2:latest-foxy
 docker_container_uid: 8001
-docker_container_username: app
+docker_container_username: dev
 docker_image_variant_name: foxy-dsr
 docker_image_version_variable_name: IMAGE_VERSION
 docker_name_prefix: ROS2

diff --git a/.docker/Dockerfile.foxy b/.docker/Dockerfile.foxy
@@ -62,13 +62,13 @@ ENV WORKSPACE_ROOT $ARG_WORKSPACE_ROOT
 RUN mkdir -p "$APP_INSTALL_ROOT/scripts"
 COPY ./.docker/scripts/install-cmake.sh "$APP_INSTALL_ROOT/scripts/install-cmake.sh"
 # Install the latest version of CMake
-ARG ARG_CMAKE_VERSION="3.29.3"
+ARG ARG_CMAKE_VERSION="3.23.2"
 ENV CMAKE_VERSION=$ARG_CMAKE_VERSION
 RUN bash "$APP_INSTALL_ROOT/scripts/install-cmake.sh"
 ENV PATH="/opt/cmake-${CMAKE_VERSION}/bin:$PATH"
 
 # Setting ARGs and ENVs for user creation and workspace setup
-ARG ARG_USERNAME="app"
+ARG ARG_USERNAME="dev"
 ARG ARG_USER_UID=8001
 ENV USERNAME $ARG_USERNAME
 ENV USER_UID $ARG_USER_UID

diff --git a/.docker/Dockerfile.foxy-dsr b/.docker/Dockerfile.foxy-dsr
@@ -14,12 +14,11 @@ ENV APP_DIRNAME $ARG_APP_DIRNAME
 ENV APP_SRC_DIR=${APP_INSTALL_ROOT}/${APP_DIRNAME}
 ENV APP_VIRTUAL_ENV=${APP_INSTALL_ROOT}/.venvs/${APP_DIRNAME}
 ENV PATH="$APP_VIRTUAL_ENV/bin:$PATH"
-ENV APP_WORKSPACE_ROOT=${APP_INSTALL_ROOT}/workspace
 ARG ARG_WORKSPACE_ROOT="/workspace"
 ENV WORKSPACE_ROOT $ARG_WORKSPACE_ROOT
 
 # Setting ARGs and ENVs for user creation and workspace setup
-ARG ARG_USERNAME="app"
+ARG ARG_USERNAME="dev"
 ARG ARG_USER_UID=8001
 ARG ARG_USER_GID=$ARG_USER_UID
 ENV USERNAME $ARG_USERNAME
@@ -42,8 +41,6 @@ RUN set -eux; \
         chmod 0440 /etc/sudoers.d/$USERNAME; \
     fi
 
-RUN mkdir -p "$APP_SRC_DIR/src"
-
 # change the owner of the workspace to the specified user id
 RUN chown --recursive $USER_UID:$USER_UID $WORKSPACE_ROOT
 # RUN chown --recursive $USER_UID:$USER_UID $APP_INSTALL_ROOT

diff --git a/.docker/docker.common.env b/.docker/docker.common.env
@@ -35,7 +35,7 @@ DOCKER_PROJECT_ID=${DOCKER_PROJECT_ID:-"default"}
 DOCKER_USERNAME=${DOCKER_USERNAME:-"entelecheia"}                            # The username for Docker.
 IMAGE_VERSION=${IMAGE_VERSION:-"1.0.0"}                     # The version of the Docker image. If not set, "1.0.0" will be used.
 CONTAINER_REGISTRY=${CONTAINER_REGISTRY:-"ghcr.io"}                      # The Docker registry to push the image to.
-CONTAINER_USERNAME="app"                                   # The username of the user. If not set, the current user's username will be used.
+CONTAINER_USERNAME="dev"                                   # The username of the user. If not set, the current user's username will be used.
 CONTAINER_USER_UID=${USER_UID:-"8001"}                           # The user ID in the Docker container.
 CONTAINER_USER_GID=${USER_GID:-"8001"}                           # The group ID in the Docker container.
 CONTAINER_GITHUB_USERNAME=${GITHUB_USERNAME:-"entelecheia"}                  # The GitHub username of the project