diff --git a/Dockerfiles/cpp/.devcontainer/Dockerfile b/Dockerfiles/cpp/.devcontainer/Dockerfile index fc31f37..f06a3f7 100644 --- 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 index 1df252f..0b2be7d 100644 --- 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 index 9bb840b..9671dc4 100644 --- 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 index f153c93..079b3a5 100644 --- 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 deleted file mode 100644 index afa26ff..0000000 --- a/common/AppManifest.json +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "dependencies": { - "python": { - "version": "3.10" - }, - "dapr": { - "cli": { - "version": "1.10.0" - } - } - } - } -] diff --git a/common/install-dapr-cli.sh b/common/install-dapr-cli.sh deleted file mode 100755 index 60bed83..0000000 --- a/common/install-dapr-cli.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -set -e -echo "#######################################################" -echo "### Install dapr-cli ###" -echo "#######################################################" - -DEFAULT_DAPR_CLI_VERSION=$(cat AppManifest.json | jq .[].dependencies.dapr.cli.version | tr -d '"') - -INSTALLED_DAPR_CLI_VERSION=$(dapr --version | grep "CLI version: " | sed 's/^.*: //' | sed 's/\s*//g') - -# Check dapr CLI -if [ "${INSTALLED_DAPR_CLI_VERSION}" != "${DEFAULT_DAPR_CLI_VERSION}" ]; then - echo "Install dapr CLI $DEFAULT_DAPR_CLI_VERSION" - wget -q https://raw.githubusercontent.com/dapr/cli/master/install/install.sh -O - | /bin/bash -s $DEFAULT_DAPR_CLI_VERSION -else - echo "Dapr CLI $DEFAULT_DAPR_CLI_VERSION is already installed." -fi diff --git a/common/install-python.sh b/common/install-python.sh index 0dd5616..f779ec5 100755 --- 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