From a4be7c5d8e3b998b72fce7ae7d13122ae522dc7c Mon Sep 17 00:00:00 2001 From: Alexey Shishkov Date: Fri, 27 Sep 2024 08:12:42 +0000 Subject: [PATCH] Rollback devcontainer Dockerfile --- .devcontainer/Dockerfile | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index c771bcd9..024c9be0 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -9,6 +9,10 @@ RUN sh install-postgres-client.sh RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - RUN apt -y install nodejs +# Setup fish +RUN apt -y install fish; chsh -s /usr/bin/fish; mkdir /root/.config; mkdir /root/.config/fish +COPY .devcontainer/config.fish /root/.config/fish + # Setup starship RUN curl https://starship.rs/install.sh --output /starship_install.sh; chmod +x /starship_install.sh RUN sh -c "/starship_install.sh -y" @@ -24,20 +28,6 @@ ENV PYTHONUNBUFFERED 1 # Help Python with imports ENV PYTHONPATH "src:${PYTHONPATH}" -RUN apt-get install ca-certificates curl -RUN install -m 0755 -d /etc/apt/keyrings -RUN curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc -RUN chmod a+r /etc/apt/keyrings/docker.asc - -# Add the repository to Apt sources: -RUN echo \ - "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian \ - $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \ - tee /etc/apt/sources.list.d/docker.list > /dev/null -RUN apt-get update -RUN apt install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin - - # Copy pipenv manifests COPY back-end/Pipfile* ./