From d11b716b4e3e8bf97de43e87f84bf975531594d0 Mon Sep 17 00:00:00 2001
From: Tobias Peters <tobias.peters@kreativeffekt.at>
Date: Mon, 29 Jan 2024 17:14:46 +0100
Subject: [PATCH] adjust devcontainer

---
 .devcontainer/Dockerfile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 66eb020007..cf9ba3f2be 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,9 +1,8 @@
 FROM ubuntu:22.04
 
-RUN apt update;\
-    apt install --yes software-properties-common; \
-    apt update
-RUN DEBIAN_FRONTEND=noninteractive apt install --yes \
+RUN apt update; \
+    DEBIAN_FRONTEND=noninteractive \
+    apt install --yes \
         autoconf \
         automake \
         bison \
@@ -57,10 +56,6 @@ RUN apt install --yes \
 # work arround as there is no debug version available
 RUN cp /lib/x86_64-linux-gnu/libcpptest.so /lib/x86_64-linux-gnu/libcpptestd.so
 
-RUN wget --output-document=/tmp/cmake.sh https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.sh \
-    && mkdir --parents "$CMAKE_INSTALL_DIR" \
-    && sh /tmp/cmake.sh --skip-license --prefix="$CMAKE_INSTALL_DIR" \
-    && ln --symbolic --force "$CMAKE_INSTALL_DIR/bin/cmake" /usr/local/bin/cmake
 
 ARG CMAKE_VERSION=3.27.9
 ARG CMAKE_INSTALL_DIR=/opt/cmake-$CMAKE_VERSION
@@ -68,6 +63,11 @@ ARG USERNAME=ryzom
 ARG USER_UID=1000
 ARG USER_GID=$USER_UID
 
+RUN wget --output-document=/tmp/cmake.sh https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.sh \
+    && mkdir --parents "$CMAKE_INSTALL_DIR" \
+    && sh /tmp/cmake.sh --skip-license --prefix="$CMAKE_INSTALL_DIR" \
+    && ln --symbolic --force "$CMAKE_INSTALL_DIR/bin/cmake" /usr/local/bin/cmake
+
 RUN groupadd --gid $USER_GID $USERNAME \
     && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \
     && apt-get update \