Skip to content

Commit

Permalink
Install fish shell in a different way
Browse files Browse the repository at this point in the history
This way works with the container being built for a different platform than it's running on
  • Loading branch information
mlandauer committed Nov 28, 2023
1 parent 4da575c commit 6f5fa31
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6f5fa31

Please sign in to comment.