From 527aa6c0d196538553a15e979ed354d16c18e9c5 Mon Sep 17 00:00:00 2001 From: casjay Date: Thu, 29 Aug 2024 16:01:02 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dockerfile Dockerfile.19.04 Dockerfile.20.04 Dockerfile.21.04 --- Dockerfile | 2 +- Dockerfile.19.04 | 4 ++-- Dockerfile.20.04 | 4 ++-- Dockerfile.21.04 | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 605d180..8144102 100644 --- a/Dockerfile +++ b/Dockerfile @@ -79,7 +79,7 @@ RUN set -e; \ echo 'export DEBIAN_FRONTEND="'${DEBIAN_FRONTEND}'"' >"/etc/profile.d/apt.sh" && chmod 755 "/etc/profile.d/apt.sh"; \ apt-get update;apt-get upgrade -yy;apt-get install -yy bash locales; \ dpkg-reconfigure --frontend=noninteractive locales;update-locale LANG=$LANG; \ - update-alternatives --install /bin/sh sh /bin/bash 1 + update-alternatives --install /bin/sh sh /bin/bash 1 ENV SHELL="/bin/bash" SHELL [ "/bin/bash", "-c" ] diff --git a/Dockerfile.19.04 b/Dockerfile.19.04 index 9db03e9..5831a6a 100644 --- a/Dockerfile.19.04 +++ b/Dockerfile.19.04 @@ -72,7 +72,7 @@ WORKDIR /root COPY ./rootfs/usr/local/bin/. /usr/local/bin/ COPY ./rootfs/etc/apt/. /etc/apt/ -COPY ./rootfs/tmp/apt/disco.list /etc/apt/sources.list +#COPY ./rootfs/tmp/apt/disco.list /etc/apt/sources.list RUN set -e; \ echo "Setting up prerequisites"; \ @@ -80,7 +80,7 @@ RUN set -e; \ echo 'export DEBIAN_FRONTEND="'${DEBIAN_FRONTEND}'"' >"/etc/profile.d/apt.sh" && chmod 755 "/etc/profile.d/apt.sh"; \ apt-get update;apt-get upgrade -yy;apt-get install -yy bash locales; \ dpkg-reconfigure --frontend=noninteractive locales;update-locale LANG=$LANG; \ - update-alternatives --install /bin/sh sh /bin/bash 1 + update-alternatives --install /bin/sh sh /bin/bash 1 ENV SHELL="/bin/bash" SHELL [ "/bin/bash", "-c" ] diff --git a/Dockerfile.20.04 b/Dockerfile.20.04 index 5b95ed9..4db8742 100644 --- a/Dockerfile.20.04 +++ b/Dockerfile.20.04 @@ -72,7 +72,7 @@ WORKDIR /root COPY ./rootfs/usr/local/bin/. /usr/local/bin/ COPY ./rootfs/etc/apt/. /etc/apt/ -COPY ./rootfs/tmp/apt/focal.list /etc/apt/sources.list +#COPY ./rootfs/tmp/apt/focal.list /etc/apt/sources.list RUN set -e; \ echo "Setting up prerequisites"; \ @@ -80,7 +80,7 @@ RUN set -e; \ echo 'export DEBIAN_FRONTEND="'${DEBIAN_FRONTEND}'"' >"/etc/profile.d/apt.sh" && chmod 755 "/etc/profile.d/apt.sh"; \ apt-get update;apt-get upgrade -yy;apt-get install -yy bash locales; \ dpkg-reconfigure --frontend=noninteractive locales;update-locale LANG=$LANG; \ - update-alternatives --install /bin/sh sh /bin/bash 1 + update-alternatives --install /bin/sh sh /bin/bash 1 ENV SHELL="/bin/bash" SHELL [ "/bin/bash", "-c" ] diff --git a/Dockerfile.21.04 b/Dockerfile.21.04 index 84e1ac7..086763a 100644 --- a/Dockerfile.21.04 +++ b/Dockerfile.21.04 @@ -72,7 +72,7 @@ WORKDIR /root COPY ./rootfs/usr/local/bin/. /usr/local/bin/ COPY ./rootfs/etc/apt/. /etc/apt/ -COPY ./rootfs/tmp/apt/hirsute.list /etc/apt/sources.list +#COPY ./rootfs/tmp/apt/hirsute.list /etc/apt/sources.list RUN set -e; \ echo "Setting up prerequisites"; \ @@ -80,7 +80,7 @@ RUN set -e; \ echo 'export DEBIAN_FRONTEND="'${DEBIAN_FRONTEND}'"' >"/etc/profile.d/apt.sh" && chmod 755 "/etc/profile.d/apt.sh"; \ apt-get update;apt-get upgrade -yy;apt-get install -yy bash locales; \ dpkg-reconfigure --frontend=noninteractive locales;update-locale LANG=$LANG; \ - update-alternatives --install /bin/sh sh /bin/bash 1 + update-alternatives --install /bin/sh sh /bin/bash 1 ENV SHELL="/bin/bash" SHELL [ "/bin/bash", "-c" ]