diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 17cd3ee..f135791 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -2,15 +2,14 @@ FROM ubuntu:24.04 ENV DOCKER_BUILDKIT=1 +# macht mise global verfügbar +ENV PATH="/root/.local/bin:${PATH}" # Install Nginx RUN apt-get -y update \ && apt-get -y install nginx git curl gnupg software-properties-common --no-install-recommends \ && rm -rf /var/lib/apt/lists/* -# Expose the port for access -EXPOSE 3000/tcp - # Run the Nginx server CMD ["/usr/sbin/nginx", "-g", "daemon off;"] @@ -21,17 +20,21 @@ CMD ["/usr/sbin/nginx", "-g", "daemon off;"] SHELL ["/bin/bash", "-c"] ## Common tools -RUN apt-get -y update && apt-get -y install neovim jq less openssl openssh-client gpg wget zip unzip autoconf patch build-essential rustc libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libgmp-dev libncurses5-dev libffi-dev libgdbm6 libgdbm-dev libdb-dev uuid-dev --no-install-recommends +RUN apt-get -y update && apt-get -y install neovim jq less openssl\ + openssh-client gpg wget zip unzip autoconf patch build-essential\ + rustc libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libgmp-dev\ + libncurses5-dev libffi-dev libgdbm6 libgdbm-dev libdb-dev uuid-dev\ + --no-install-recommends ## Mise RUN curl https://mise.run | sh \ && echo 'eval "$(~/.local/bin/mise activate bash)"' >> ~/.bashrc ## Java -# RUN ~/.local/bin/mise use java@lts -g +# RUN mise use java@lts -g ## Nodejs -# RUN ~/.local/bin/mise use node@lts -g +# RUN mise use node@lts -g # Funky Terminal RUN sh -c "$(wget -O- https://github.com/deluan/zsh-in-docker/releases/download/v1.2.0/zsh-in-docker.sh)" -- \ @@ -59,10 +62,8 @@ RUN sh -c "$(wget -O- https://github.com/deluan/zsh-in-docker/releases/download/ # && echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com bookworm main" | tee /etc/apt/sources.list.d/hashicorp.list \ # && apt-get update && apt-get -y install terraform=1.9.2-* --no-install-recommends -## Kamal via mise and ruby -# RUN curl https://mise.run | sh \ -# && echo 'eval "$(~/.local/bin/mise activate bash)"' >> ~/.bashrc \ -# && ~/.local/bin/mise use --global ruby@3.2.2 \ -# && ~/.local/share/mise/installs/ruby/3.2.2/bin/gem install kamal +## Kamal via mise and ruby: https://mise.jdx.dev/cli/exec.html +# RUN mise use ruby@3.2.2 -g \ +# && mise x -- gem install kamal -v 1.9.2 WORKDIR /workspace diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 664f69d..85963eb 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,7 +4,9 @@ "name": "Existing Docker Compose (Extend)", // Update the 'dockerComposeFile' list if you have more compose files or use different names. // The .devcontainer/docker-compose.yml file contains any overrides you need/want to make. - "dockerComposeFile": ["../docker-compose.yml"], + "dockerComposeFile": [ + "../docker-compose.yml" + ], //"overrideCommand": false, //"postStartCommand": "/usr/sbin/nginx -g 'daemon off;'", // The 'service' property is the name of the service for the container that VS Code should @@ -19,16 +21,26 @@ "ghcr.io/devcontainers/features/docker-in-docker:2": {} }, // Use 'forwardPorts' to make a list of ports inside the container available locally. - // "forwardPorts": [80] + "forwardPorts": [3000,3001], // Uncomment the next line if you want start specific services in your Docker Compose config. - "runServices": ["devcontainer"], + "runServices": [ + "devcontainer" + ], "customizations": { "vscode": { "extensions": [ "vivaxy.vscode-conventional-commits", "EditorConfig.EditorConfig", "ms-azuretools.vscode-docker" - ] + ], + "settings": { + "terminal.integrated.defaultProfile.linux": "zsh", + "terminal.integrated.profiles.linux": { + "zsh": { + "path": "/usr/bin/zsh" + } + } + } } } // Uncomment the next line if you want to keep your containers running after VS Code shuts down. @@ -40,4 +52,3 @@ // Uncomment to connect as an existing user other than the container default. More info: https://aka.ms/dev-containers-non-root. // "remoteUser": "devcontainer" } -