fix whitespace
This commit is contained in:
56
Dockerfile
56
Dockerfile
@@ -1,9 +1,9 @@
|
|||||||
FROM debian:trixie-slim
|
FROM debian:trixie-slim
|
||||||
|
|
||||||
RUN set -eux && \
|
RUN set -eux && \
|
||||||
groupadd -r postgres --gid=5432 && \
|
groupadd -r postgres --gid=5432 && \
|
||||||
useradd -r -g postgres --uid=5432 --home-dir=/var/lib/postgresql --shell=/bin/bash postgres && \
|
useradd -r -g postgres --uid=5432 --home-dir=/var/lib/postgresql --shell=/bin/bash postgres && \
|
||||||
install --verbose --directory --owner postgres --group postgres --mode 1755 /var/lib/postgresql && \
|
install --verbose --directory --owner postgres --group postgres --mode 1755 /var/lib/postgresql && \
|
||||||
echo 'export PATH="${PATH}:/usr/lib/postgresql/15/bin"' > /var/lib/postgresql/.profile
|
echo 'export PATH="${PATH}:/usr/lib/postgresql/15/bin"' > /var/lib/postgresql/.profile
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
@@ -19,38 +19,38 @@ RUN apt-get update && \
|
|||||||
COPY ssh /ssh/
|
COPY ssh /ssh/
|
||||||
|
|
||||||
RUN set -eux && \
|
RUN set -eux && \
|
||||||
grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker && \
|
grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker && \
|
||||||
sed -ri '/\/usr\/share\/locale/d' /etc/dpkg/dpkg.cfg.d/docker && \
|
sed -ri '/\/usr\/share\/locale/d' /etc/dpkg/dpkg.cfg.d/docker && \
|
||||||
! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker && \
|
! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker && \
|
||||||
apt-get update && \
|
apt-get update && \
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
locales && \
|
locales && \
|
||||||
rm -rf /var/lib/apt/lists/* && \
|
rm -rf /var/lib/apt/lists/* && \
|
||||||
echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && \
|
echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && \
|
||||||
locale-gen && \
|
locale-gen && \
|
||||||
locale -a | grep 'en_US.utf8'
|
locale -a | grep 'en_US.utf8'
|
||||||
ENV LANG=en_US.utf8
|
ENV LANG=en_US.utf8
|
||||||
|
|
||||||
ENV GOSU_VERSION 1.19
|
ENV GOSU_VERSION 1.19
|
||||||
RUN set -eux && \
|
RUN set -eux && \
|
||||||
savedAptMark="$(apt-mark showmanual)" && \
|
savedAptMark="$(apt-mark showmanual)" && \
|
||||||
apt-get update && \
|
apt-get update && \
|
||||||
apt-get install -y --no-install-recommends ca-certificates gnupg wget && \
|
apt-get install -y --no-install-recommends ca-certificates gnupg wget && \
|
||||||
rm -rf /var/lib/apt/lists/* && \
|
rm -rf /var/lib/apt/lists/* && \
|
||||||
dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" && \
|
dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" && \
|
||||||
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" && \
|
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" && \
|
||||||
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" && \
|
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" && \
|
||||||
export GNUPGHOME="$(mktemp -d)" && \
|
export GNUPGHOME="$(mktemp -d)" && \
|
||||||
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \
|
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \
|
||||||
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \
|
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \
|
||||||
gpgconf --kill all && \
|
gpgconf --kill all && \
|
||||||
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \
|
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \
|
||||||
apt-mark auto '.*' > /dev/null && \
|
apt-mark auto '.*' > /dev/null && \
|
||||||
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null && \
|
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null && \
|
||||||
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false && \
|
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false && \
|
||||||
chmod +x /usr/local/bin/gosu && \
|
chmod +x /usr/local/bin/gosu && \
|
||||||
gosu --version && \
|
gosu --version && \
|
||||||
gosu nobody true
|
gosu nobody true
|
||||||
|
|
||||||
VOLUME /ssh
|
VOLUME /ssh
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user