Remove support of k3d and Dapr (#62)

* Remove support of k3d and Dapr * Remove outdated AppManifest.json
eclipse-velocitas · Mar 20, 2024 · 30da6d5 · 30da6d5
1 parent cb38cb1
commit 30da6d5
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 64 deletions.
diff --git a/Dockerfiles/cpp/.devcontainer/Dockerfile b/Dockerfiles/cpp/.devcontainer/Dockerfile
@@ -93,7 +93,6 @@ COPY ./common .
 
 ARG TARGETARCH
 RUN ./install-python.sh && \
-    ./install-dapr-cli.sh && \
     ./install-velocitas-cli.sh ${TARGETARCH} && \
     ./install-kanto.sh ${TARGETARCH}
 

diff --git a/Dockerfiles/cpp/.devcontainer/devcontainer.json b/Dockerfiles/cpp/.devcontainer/devcontainer.json
@@ -4,7 +4,7 @@
         "dockerfile": "Dockerfile",
         "context": "../../..",
         "args": {
-            "SDK_TAG": "v0.4.2"
+            "SDK_TAG": "v0.4.3"
         }
     },
     "features": {
@@ -13,13 +13,6 @@
             "version": "2.41.0"
         },
         "ghcr.io/devcontainers/features/common-utils:2.1.2": {},
-        "ghcr.io/devcontainers/features/docker-in-docker:2.5.0": {},
-        "ghcr.io/devcontainers/features/kubectl-helm-minikube:1.1.4": {
-            "version": "1.28.0",
-            "helm": "3.12.3",
-            "minikube": "none"
-        },
-        "ghcr.io/rio/features/k3d:1.1.0": {},
-        "ghcr.io/rio/features/k9s:1.1.5": {}
+        "ghcr.io/devcontainers/features/docker-in-docker:2.5.0": {}
     }
 }
diff --git a/Dockerfiles/python/.devcontainer/Dockerfile b/Dockerfiles/python/.devcontainer/Dockerfile
@@ -32,7 +32,6 @@ COPY ./common .
 
 ARG TARGETARCH
 RUN ./install-python.sh && \
-    ./install-dapr-cli.sh && \
     ./install-velocitas-cli.sh ${TARGETARCH} && \
     ./install-kanto.sh ${TARGETARCH}
 

diff --git a/Dockerfiles/python/.devcontainer/devcontainer.json b/Dockerfiles/python/.devcontainer/devcontainer.json
@@ -10,13 +10,6 @@
             "version": "2.41.0"
         },
         "ghcr.io/devcontainers/features/common-utils:2.1.2": {},
-        "ghcr.io/devcontainers/features/docker-in-docker:2.5.0": {},
-        "ghcr.io/devcontainers/features/kubectl-helm-minikube:1.1.4": {
-            "version": "1.28.0",
-            "helm": "3.12.3",
-            "minikube": "none"
-        },
-        "ghcr.io/rio/features/k3d:1.1.0": {},
-        "ghcr.io/rio/features/k9s:1.1.5": {}
+        "ghcr.io/devcontainers/features/docker-in-docker:2.5.0": {}
     }
 }
diff --git a/common/AppManifest.json b/common/AppManifest.json
diff --git a/common/install-dapr-cli.sh b/common/install-dapr-cli.sh
diff --git a/common/install-python.sh b/common/install-python.sh
@@ -17,7 +17,7 @@ set -e
 echo "#######################################################"
 echo "### Installing python version 3                     ###"
 echo "#######################################################"
-PYTHON_VERSION=$(cat AppManifest.json | jq .[].dependencies.python.version | tr -d '"')
+PYTHON_VERSION='3.10'
 
 sudo apt-get update && apt-get install -y python3-distutils python$PYTHON_VERSION python3-dev
 curl -fsSL https://bootstrap.pypa.io/get-pip.py | sudo python$PYTHON_VERSION