Feature/devcontainer

.devcontainer/Containerfile

@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-FROM docker.io/library/ubuntu:22.04@sha256:b492494d8e0113c4ad3fe4528a4b5ff89faa5331f7d52c5c138196f69ce176a6 as build
+FROM docker.io/library/ubuntu:24.04@sha256:2e863c44b718727c860746568e1d54afd13b2fa71b160f5cd9058fc436217b30 as build
 
 # Install dependencies
 RUN DEBIAN_FRONTEND="noninteractive" apt-get update && \
@@ -31,18 +31,25 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update && \
         lcov \
         sudo \
         python3 \
-        python3-pip && \
+        pipx && \
     apt-get clean
 
+#python3-pip && \
+
 # Build image using conan & cmake
 FROM build as conan-build
 
 # Install conan
-RUN pip3 install conan && pip3 cache purge
+#RUN pip3 install conan && pip3 cache purge
+##RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y --no-install-recommends \
+#        python3-conan && \
+#    apt-get clean
+ENV PATH="${PATH}:/root/.local/bin"
+RUN pipx install conan
 
 # Setup conan profile for root
-COPY .devcontainer/conan-container-default-profile /root/.conan2/profiles/default
-COPY .devcontainer/conan-container-debug-profile /root/.conan2/profiles/debug
+COPY conan-container-default-profile /root/.conan2/profiles/default
+COPY conan-container-debug-profile /root/.conan2/profiles/debug
 
 # Build image using apt dependencies
 FROM build as apt-build
@@ -65,18 +72,29 @@ RUN DEBIAN_FRONTEND="noninteractive" sudo apt-get update && \
         uuid-dev && \
     sudo apt-get clean
 
-FROM conan-build as conan-dev
+#Note from build not conan-build, because conan-dev uses a celixdev user
+FROM build as conan-dev
 
-# Add user celixdev with sudo rights and a "celixdev" password
-RUN useradd -m -s /bin/bash -G sudo celixdev && \
+# Remove ubuntu user and add celixdev with sudo rights and a "celixdev" password
+RUN userdel -r ubuntu && \
+    groupadd --gid 1000 celixdev && \
+    useradd --uid 1000 --gid 1000 -m \
+    -s /bin/bash -G sudo celixdev && \
     echo "%sudo  ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \
     echo "celixdev:celixdev" | chpasswd
 USER celixdev
 WORKDIR /home/celixdev
 
+#Create workdir, used in vscode
+#RUN sudo mkdir -p /workspaces/celix/build && sudo chown -R celixdev:celixdev /workspaces
+
+# Setup python venv for celixdev and install conan
+ENV PATH="${PATH}:/home/celixdev/.local/bin"
+RUN pipx install conan
+
 # Setup conan profile for celixdev
-COPY .devcontainer/conan-container-default-profile /home/celixdev/.conan2/profiles/default
-COPY .devcontainer/conan-container-debug-profile /home/celixdev/.conan2/profiles/debug
+COPY --chown=celixdev:celixdev conan-container-default-profile /home/celixdev/.conan2/profiles/default
+COPY --chown=celixdev:celixdev conan-container-debug-profile /home/celixdev/.conan2/profiles/debug
 
 #Install development dependencies
 RUN sudo DEBIAN_FRONTEND="noninteractive" apt-get update && \
@@ -88,8 +106,11 @@ RUN sudo mkdir /run/sshd
 
 FROM apt-build as apt-dev
 
-# Add user celixdev with sudo rights and a "celixdev" password
-RUN useradd -m -s /bin/bash -G sudo celixdev && \
+# Remove ubuntu user and add celixdev with sudo rights and a "celixdev" password
+RUN userdel -r ubuntu && \
+    groupadd --gid 1000 celixdev && \
+    useradd --uid 1000 --gid 1000 -m \
+    -s /bin/bash -G sudo celixdev && \
     echo "%sudo  ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \
     echo "celixdev:celixdev" | chpasswd
 USER celixdev

.devcontainer/README.md

@@ -54,4 +54,13 @@ ssh -p 2233 celixdev@localhost
 In CLion, open the Remote Development window by navigating to "File -> Remote Development..." and add a new
 configuration. When a new configuration is added, you can start a new project using `/home/celixdev/workspace` as the
 project root and
-selecting CLion as the IDE.
+selecting CLion as the IDE.
+
+## Running tests
+Tests can be runned using ctest. When building with conan, the conanrun.sh script will setup the environment for the
+built dependencies. To run the tests, execute the following commands:
+
+```shell
+cd build
+ctest --output-on-failure --test-command ./workspaces/celix/build/conanrun.sh
+```

.devcontainer/build-project-with-conan.sh

@@ -17,6 +17,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-conan build . --build missing --options build_all=True --options enable_address_sanitizer=True \
-      --options enable_testing=True --options enable_ccache=True --output-folder build \
-      --conf tools.cmake.cmaketoolchain:generator=Ninja --settings build_type=Debug
+conan build . --profile debug \
+          --options celix/*:build_all=True --options celix/*:enable_address_sanitizer=True \
+          --options celix/*:enable_testing=True --options celix/*:enable_ccache=True \
+          --conf:build tools.cmake.cmaketoolchain:generator=Ninja \
+          --output-folder build

.devcontainer/conan-container-debug-profile

@@ -15,12 +15,12 @@
 # specific language governing permissions and limitations
 # under the License.
 
-#Based on gcc from ubuntu:22.04 base image
+#Based on gcc from ubuntu:24.04 base image
 [settings]
 arch=x86_64
 build_type=Debug
 compiler=gcc
 compiler.cppstd=17
 compiler.libcxx=libstdc++11
-compiler.version=11
+compiler.version=13
 os=Linux

.devcontainer/conan-container-default-profile

@@ -15,12 +15,12 @@
 # specific language governing permissions and limitations
 # under the License.
 
-#Based on gcc from ubuntu:22.04 base image
+#Based on gcc from ubuntu:24.04 base image
 [settings]
 arch=x86_64
 build_type=Release
 compiler=gcc
 compiler.cppstd=17
 compiler.libcxx=libstdc++11
-compiler.version=11
+compiler.version=13
 os=Linux

.devcontainer/devcontainer.json

@@ -7,6 +7,8 @@
      "runArgs" : [
         "--userns=keep-id"
     ],
+    "remoteUser": "celixdev",
+    "containerUser": "celixdev",
     "onCreateCommand": "sh .devcontainer/setup-project-with-conan.sh",
     "postCreateCommand": "sh .devcontainer/build-project-with-conan.sh"
 }

.devcontainer/setup-project-with-conan.sh

@@ -17,6 +17,10 @@
 # specific language governing permissions and limitations
 # under the License.
 
-conan install . --build missing --options build_all=True --options enable_address_sanitizer=True \
-      --options enable_testing=True --options enable_ccache=True --output-folder build \
-      --conf tools.cmake.cmaketoolchain:generator=Ninja --settings build_type=Debug
+mkdir build
+
+conan install . --build missing --profile debug \
+          --options celix/*:build_all=True --options celix/*:enable_address_sanitizer=True \
+          --options celix/*:enable_testing=True --options celix/*:enable_ccache=True \
+          --conf:build tools.cmake.cmaketoolchain:generator=Ninja \
+          --output-folder build

.github/workflows/containers.yml

@@ -25,7 +25,8 @@ jobs:
           restore-keys: cache-ccache-container-${{ runner.os }}-${{ github.job }}-
       - name: Build container image
         run: |
-          docker build --tag apache/celix-conan-build:latest --target conan-build --file .devcontainer/Containerfile .
+          cd .devcontainer && \
+          docker build --tag apache/celix-conan-build:latest --target conan-build --file Containerfile .
       - name: Build Celix dependencies
         run: | #Using .conan2-container so that the steps can be reproduced locally without affecting the host conan 
           mkdir -p ~/.conan2-container/profiles && \
@@ -55,8 +56,7 @@ jobs:
           docker run --rm -v ~/.conan2-container:/root/.conan2 -v $(pwd):/workspace \
           apache/celix-conan-build:latest /bin/bash -c \
           "cd /workspace/build && \
-          source conanrun.sh && \
-          ctest --output-on-failure -E unit_test_discovery_zeroconf"          
+          ctest --output-on-failure --test-command ./workspaces/celix/build/conanrun.sh"          
 
   container-apt-build-ubuntu:
     runs-on: ubuntu-22.04
@@ -66,7 +66,8 @@ jobs:
         uses: actions/checkout@v3.3.0
       - name: Build container image
         run: |
-          docker build --tag apache/celix-apt-build:latest --target apt-build --file .devcontainer/Containerfile .
+          cd .devcontainer && \
+          docker build --tag apache/celix-apt-build:latest --target apt-build --file Containerfile .
       - name: Cache ccache
         uses: actions/cache@v3
         with:
@@ -95,5 +96,6 @@ jobs:
         uses: actions/checkout@v3.3.0
       - name: Build dev container images
         run: |
-          docker build --tag apache/celix-conan-dev:latest --target conan-dev --file .devcontainer/Containerfile .
-          docker build --tag apache/celix-apt-dev:latest --target apt-dev --file .devcontainer/Containerfile .
+          cd .devcontainer && \
+          docker build --tag apache/celix-conan-dev:latest --target conan-dev --file Containerfile . && \
+          docker build --tag apache/celix-apt-dev:latest --target apt-dev --file Containerfile .

conanfile.py

@@ -322,6 +322,7 @@ def requirements(self):
                 or self.options.build_rsa_discovery_common or self.options.build_rsa_remote_service_admin_dfi
                 or self.options.build_launcher):
             self.requires("libcurl/[>=8.4.0 <9.0.0]")
+            self.requires("openssl/[>=3.2.0]")
         if (self.options.build_rsa_discovery_common
                 or (self.options.build_rsa_remote_service_admin_dfi and self.options.enable_testing)):
             self.requires("libxml2/[>=2.9.9 <3.0.0]")