Move to bullseye

hse-mtc · Sep 27, 2024 · c9f9380 · c9f9380
1 parent 3b509d1
commit c9f9380
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,5 +1,5 @@
 # Base Python image
-FROM python:3.9.1-buster
+FROM python:3.9.1-bullseye
 
 # Update system and install backup utilities
 COPY back-end/docker/image/install-postgres-client.sh /
@@ -9,10 +9,6 @@ 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"
@@ -28,6 +24,20 @@ 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* ./
 

diff --git a/back-end/docker/image/dev.dockerfile b/back-end/docker/image/dev.dockerfile
@@ -1,5 +1,5 @@
 # Base Python image
-FROM python:3.10-buster
+FROM python:3.10-bullseye
 
 # Update system and install backup utilities
 COPY back-end/docker/image/install-postgres-client.sh /

diff --git a/back-end/docker/image/prod.dockerfile b/back-end/docker/image/prod.dockerfile
@@ -1,5 +1,5 @@
 # Base Python image
-FROM python:3.10-buster
+FROM python:3.10-bullseye
 
 # Update system and install backup utilities
 COPY back-end/docker/image/install-postgres-client.sh /

diff --git a/tgbot/Dockerfile b/tgbot/Dockerfile
@@ -1,5 +1,5 @@
 # Base Python image
-FROM python:3.10-buster
+FROM python:3.10-bullseye
 
 # Set environment variables
 ENV PYTHONDONTWRITEBYTECODE 1

diff --git a/watchdoc/Dockerfile b/watchdoc/Dockerfile
@@ -1,5 +1,5 @@
 # Base Python image
-FROM python:3.9.1-buster
+FROM python:3.9.1-bullseye
 
 # Set working directory
 WORKDIR /watchdoc