From 6f5fa314d7a76253f48eeeefb2cbfd61eac4e078 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Tue, 28 Nov 2023 03:16:15 +0000 Subject: [PATCH] Install fish shell in a different way This way works with the container being built for a different platform than it's running on --- .devcontainer/devcontainer.json | 6 +++--- Dockerfile | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index bfbcfdf64..df2294cbf 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -17,11 +17,11 @@ // The optional 'workspaceFolder' property is the path VS Code should open by default when // connected. This is typically a file mount in .devcontainer/docker-compose.yml "workspaceFolder": "/app", - "features": { - "ghcr.io/meaningful-ooo/devcontainer-features/fish:1": {} - }, "customizations": { "vscode": { + "settings": { + "terminal.integrated.defaultProfile.linux": "fish" + }, "extensions": [ "wingrunr21.vscode-ruby", "karunamurti.haml", diff --git a/Dockerfile b/Dockerfile index 0b3cf7309..47870df2a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -43,6 +43,9 @@ RUN apt-get install -y nodejs # Install firefox for running some integration tests RUN apt-get update; apt-get install -y firefox-esr +# Install the fish shell +RUN apt-get install -y fish + USER deploy COPY --chown=deploy:deploy Gemfile /app/Gemfile