From 8a03574432d54100756a977adc0d665b5cb56bd3 Mon Sep 17 00:00:00 2001 From: ShishckovA Date: Wed, 9 Oct 2024 01:15:51 +0000 Subject: [PATCH] Fix devcontainers --- .devcontainer/Dockerfile | 8 ++++---- .devcontainer/docker-compose.yml | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 4840c3d98..354f98a95 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,13 +1,13 @@ # Base Python image -FROM python:3.9.20-bullseye +FROM python:3.10-bullseye # Update system and install backup utilities COPY back-end/docker/image/install-postgres-client.sh / RUN sh install-postgres-client.sh -# Install node 14 -RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - -RUN apt -y install nodejs +# Install node 16 +RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash +RUN . ~/.nvm/nvm.sh && nvm install 16 # Setup fish RUN apt -y install fish; chsh -s /usr/bin/fish; mkdir /root/.config; mkdir /root/.config/fish diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 1a2b05c01..544dbed0e 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -18,7 +18,8 @@ services: - ../back-end/.env volumes: # Forwards the local Docker socket to the container. - - /var/run/docker.sock:/var/run/docker-host.sock + - ~/.ssh:/root/.ssh + - /var/run/docker.sock:/var/run/docker.sock # Update this to wherever you want VS Code to mount the folder of your project - ..:/workspace:cached