From 818c0330fb9d0c1ac04eddcf01e2740231364ece Mon Sep 17 00:00:00 2001 From: Shengqi Chen Date: Sat, 2 Dec 2023 16:22:01 +0800 Subject: [PATCH] Downgrade nix-channels to bullseye, remove php-related dependencies in base image Signed-off-by: Shengqi Chen --- Dockerfile | 7 ++++++- dockerfiles/nix-channels/Dockerfile | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7b86fc2..099e6dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,12 @@ FROM debian:buster LABEL maintainer="Miao Wang " RUN apt-get update && \ - apt-get install --no-install-recommends -y wget curl rsync lftp git jq python3-dev python3-pip yum-utils createrepo aria2 ack composer php-curl php-zip libnss-unknown xz-utils patch unzip openssh-client debmirror + apt-get install --no-install-recommends -y \ + wget curl rsync lftp git jq python3-dev python3-pip \ + yum-utils createrepo debmirror \ + libnss-unknown xz-utils patch unzip \ + aria2 ack openssh-client + # composer php-curl php-zip RUN if [ "$(uname -m)" != "x86_64" -a "$(uname -m)" != "i386" ]; then \ apt-get install --no-install-recommends -y libxml2-dev libxslt1-dev zlib1g-dev libssl-dev libffi-dev ;\ diff --git a/dockerfiles/nix-channels/Dockerfile b/dockerfiles/nix-channels/Dockerfile index ffc209f..b7c10ac 100644 --- a/dockerfiles/nix-channels/Dockerfile +++ b/dockerfiles/nix-channels/Dockerfile @@ -1,5 +1,5 @@ -FROM debian:bookworm -LABEL maintainer="WANG Ruikang " +FROM debian:bullseye +LABEL maintainer="Wang Ruikang " RUN apt-get update && \ apt-get install -y python3-dev python3-pip curl