From 5079eaf86417ebce175d98b4247ddc117f30e46e Mon Sep 17 00:00:00 2001
From: david <david@joules.ch>
Date: Sat, 26 Oct 2024 00:00:56 +0200
Subject: [PATCH] Dev env

---
 .devcontainer/devcontainer.json | 2 +-
 Dockerfile                      | 2 +-
 docker-compose.yml              | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 3ad0bbb..e9bb63d 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -50,7 +50,7 @@
 				"terminal.integrated.defaultProfile.linux": "fish",
 				"terminal.integrated.profiles.linux": {
 					"fish": {
-						"path": "/bin/fish"
+						"path": "/usr/bin/fish"
 					}
 				}
 			}
diff --git a/Dockerfile b/Dockerfile
index 64b137a..d7dcac6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ ARG UID=1000
 ARG GID=1000
 ARG APP_PORT=3000
 ARG INSTALL_DIR=/${NAME}
-ARG RUBY_VERSION=3.3.5
+ARG RUBY_VERSION=3.2.5
 FROM ruby:${RUBY_VERSION} AS development
 
 ARG NAME
diff --git a/docker-compose.yml b/docker-compose.yml
index 769d603..54e59ce 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,6 +15,8 @@ services:
     - ${PWD}:${PWD}
     - ${HOME}/.tabby-client:/home/app/.tabby-client
     - ${SSH_AUTH_SOCK}:/ssh-agent
+    env_file:
+    - .env
     environment:
       RAILS_ENV: development
       LOG_LEVEL: debug