From 16a98a8a25be4f4a91ffba806d02b2489b4fa577 Mon Sep 17 00:00:00 2001 From: Dan Lipsitt <578773+DanLipsitt@users.noreply.github.com> Date: Thu, 23 May 2024 11:54:47 -0700 Subject: [PATCH 1/4] playground dockerfile: add libcap We need both libpcap and libcap dev packages, but the latter was missing. They do different things but are easily confused. Signed-off-by: Dan Lipsitt <578773+DanLipsitt@users.noreply.github.com> --- docker/everest-playground/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/everest-playground/Dockerfile b/docker/everest-playground/Dockerfile index 92ba2e79..34d2816d 100644 --- a/docker/everest-playground/Dockerfile +++ b/docker/everest-playground/Dockerfile @@ -43,6 +43,7 @@ RUN apt-get update \ libssl-dev \ libcurl4-openssl-dev \ pkg-config \ + libcap-dev \ libpcap-dev \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* From d2f18cb21bac8de9131e7842c4f7efeb32a48e55 Mon Sep 17 00:00:00 2001 From: Dan Lipsitt <578773+DanLipsitt@users.noreply.github.com> Date: Thu, 23 May 2024 11:49:01 -0700 Subject: [PATCH 2/4] Update .devcontainer.json to fix vscode error warnings. No functional changes. Signed-off-by: Dan Lipsitt <578773+DanLipsitt@users.noreply.github.com> --- docker/everest-playground/.devcontainer.json | 35 +++++++++++--------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/docker/everest-playground/.devcontainer.json b/docker/everest-playground/.devcontainer.json index 249cb566..8020b96d 100644 --- a/docker/everest-playground/.devcontainer.json +++ b/docker/everest-playground/.devcontainer.json @@ -7,12 +7,25 @@ "MQTT_SERVER_ADDRESS": "mqtt-server", "MQTT_SERVER_PORT": "1883" }, - "extensions": [ - "ms-python.python", - "ms-vscode.cpptools", - "twxs.cmake", - "ms-vscode.cmake-tools" - ], + "customizations": { + "vscode": { + "extensions": [ + "ms-python.python", + "ms-vscode.cpptools", + "twxs.cmake", + "ms-vscode.cmake-tools" + ], + "settings": { + "terminal.integrated.profiles.linux": { + "bash": { + "path": "/bin/bash" + } + }, + "terminal.integrated.defaultProfile.linux": "bash", + "python.pythonPath": "/usr/bin/python3" + } + } + }, "postCreateCommand": "", "remoteUser": "docker", "runArgs": [ @@ -20,13 +33,5 @@ ], "workspaceFolder": "/workspace/everest-cpp", "workspaceMount": "source=${localWorkspaceFolder}/../../,target=/workspace,type=bind", - "settings": { - "terminal.integrated.profiles.linux": { - "bash": { - "path": "/bin/bash" - } - }, - "terminal.integrated.defaultProfile.linux": "bash", - "python.pythonPath": "/usr/bin/python3" - } + } From b382d13e2e363916eb80156dc99d8dd6f5663c82 Mon Sep 17 00:00:00 2001 From: Dan Lipsitt <578773+DanLipsitt@users.noreply.github.com> Date: Thu, 30 May 2024 21:17:32 -0700 Subject: [PATCH 3/4] Try using debian bookworm. Checking this in for historical purposes since I'm about to take a different approach. Signed-off-by: Dan Lipsitt <578773+DanLipsitt@users.noreply.github.com> --- docker/everest-playground/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/everest-playground/Dockerfile b/docker/everest-playground/Dockerfile index 34d2816d..cc6e9ec4 100644 --- a/docker/everest-playground/Dockerfile +++ b/docker/everest-playground/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=debian:11 +ARG BASE_IMAGE=debian:bookworm FROM ${BASE_IMAGE} ARG BASE_IMAGE From 7de2030b46390374624a0eac85c42a5ee2c1c301 Mon Sep 17 00:00:00 2001 From: Dan Lipsitt <578773+DanLipsitt@users.noreply.github.com> Date: Thu, 30 May 2024 21:18:25 -0700 Subject: [PATCH 4/4] Probably don't need java in the dev container. Signed-off-by: Dan Lipsitt <578773+DanLipsitt@users.noreply.github.com> --- docker/everest-playground/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/everest-playground/Dockerfile b/docker/everest-playground/Dockerfile index cc6e9ec4..8cb1697b 100644 --- a/docker/everest-playground/Dockerfile +++ b/docker/everest-playground/Dockerfile @@ -34,8 +34,8 @@ RUN apt-get update \ clang-tidy \ cppcheck \ libboost-all-dev \ - maven \ - openjdk-11-jdk \ + # maven \ + # openjdk-11-jdk \ nodejs \ npm \ libsqlite3-dev \