diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index ca23960..6957939 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -27,13 +27,14 @@ RUN apt-get update \ # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ # && apt-get -y install --no-install-recommends -# Set up the Kubernetes tools +# Set up the Kubernetes and IBM Cloud tools RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/$(dpkg --print-architecture)/kubectl" \ && install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl \ && echo "alias kc='/usr/local/bin/kubectl'" >> /home/$USERNAME/.bash_aliases \ && chown $USERNAME:$USERNAME /home/$USERNAME/.bash_aliases \ && curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | bash \ - && curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash + && curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash \ + && curl -fsSL https://clis.cloud.ibm.com/install/linux | sh # Update Python tools RUN pip3 install -U pip wheel setuptools diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index e2990d4..7c73bb5 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -21,6 +21,7 @@ "inercia.vscode-k3d" ], "postCreateCommand": "pip install -U pip wheel && pip install -r requirements.txt", + "forwardPorts": [8080], "features": { "docker-in-docker": { "version": "latest", diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 8b12420..7ba219f 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -9,16 +9,17 @@ services: init: true privileged: true # ports: - # - 5000:5000 + # - 8080:8080 volumes: - ..:/app - ~/.gitconfig:/home/vscode/.gitconfig - ~/.ssh/:/home/vscode/.ssh/ + - ~/.bluemix/:/home/vscode/.bluemix/ - dind-var-lib-docker:/var/lib/docker command: sleep infinity environment: FLASK_APP: service:app - PORT: 5000 + PORT: 8080 DATABASE_URI: "redis://redis:6379/0" networks: - dev