From 5eed55a21b4fab80e8062a40866a55733b76f7de Mon Sep 17 00:00:00 2001
From: Neil-Jocelyn Schark <neil.schark@h-da.de>
Date: Thu, 7 Dec 2023 10:38:56 +0000
Subject: [PATCH] Update base image for dev container setup and improve make
clean
See merge request danet/gosdn!647
---
.devcontainer/Dockerfile | 3 ++-
Makefile | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 811bc1b83..b785b246e 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,6 +1,6 @@
# The devcontainer will be based on debian
# The base container already has entrypoint, vscode user account, etc. out of the box
-FROM mcr.microsoft.com/vscode/devcontainers/base:bullseye
+FROM mcr.microsoft.com/vscode/devcontainers/base:bookworm
# Containerlab version will be set in devcontainer.json
ARG _CLAB_VERSION
@@ -17,6 +17,7 @@ RUN apt-get update \
sshpass \
curl \
wget \
+ openssl \
iputils-ping \
htop \
zsh \
diff --git a/Makefile b/Makefile
index d81179029..9200d265d 100644
--- a/Makefile
+++ b/Makefile
@@ -99,8 +99,8 @@ controller-integration-tests-debug-up: generate-certs containerize-gosdn contain
controller-integration-tests-debug-down:
docker-compose -f dev_env_data/docker-compose/integration-test_docker-compose.yml down
-# Warning: Depending on you go configuration might also clean caches, modules and docker containers from your other projects.
+# Warning: Depending on your go and development configuration might also clean caches, modules and docker containers from your other projects.
clean:
+ rm -r $(BUILD_ARTIFACTS_PATH)
$(GOCLEAN)
- rm -rf $(BUILD_ARTIFACTS_PATH) $(TOOLS_DIR)
docker system prune -af
--
GitLab