mirror of
https://github.com/neondatabase/neon.git
synced 2026-01-03 11:32:56 +00:00
02b28ae0b1
Changes the vm-informant's postgres connection string's dbname from "neondb" (which sometimes doesn't exist) to "postgres" (which _hopefully_ should exist more often?). Currently there are a handful of VMs in prod that aren't working with autoscaling because they don't have the "neondb" database. The vm-informant doesn't require any database in particular; it's just connecting as `cloud_admin` to be able to adjust the file cache settings.
71 lines
2.3 KiB
Docker
71 lines
2.3 KiB
Docker
# Note: this file *mostly* just builds on Dockerfile.compute-node
|
|
|
|
ARG SRC_IMAGE
|
|
ARG VM_INFORMANT_VERSION=v0.1.14
|
|
# on libcgroup update, make sure to check bootstrap.sh for changes
|
|
ARG LIBCGROUP_VERSION=v2.0.3
|
|
|
|
# Pull VM informant, to copy from later
|
|
FROM neondatabase/vm-informant:$VM_INFORMANT_VERSION as informant
|
|
|
|
# Build cgroup-tools
|
|
#
|
|
# At time of writing (2023-03-14), debian bullseye has a version of cgroup-tools (technically
|
|
# libcgroup) that doesn't support cgroup v2 (version 0.41-11). Unfortunately, the vm-informant
|
|
# requires cgroup v2, so we'll build cgroup-tools ourselves.
|
|
FROM debian:bullseye-slim as libcgroup-builder
|
|
ARG LIBCGROUP_VERSION
|
|
|
|
RUN set -exu \
|
|
&& apt update \
|
|
&& apt install --no-install-recommends -y \
|
|
git \
|
|
ca-certificates \
|
|
automake \
|
|
cmake \
|
|
make \
|
|
gcc \
|
|
byacc \
|
|
flex \
|
|
libtool \
|
|
libpam0g-dev \
|
|
&& git clone --depth 1 -b $LIBCGROUP_VERSION https://github.com/libcgroup/libcgroup \
|
|
&& INSTALL_DIR="/libcgroup-install" \
|
|
&& mkdir -p "$INSTALL_DIR/bin" "$INSTALL_DIR/include" \
|
|
&& cd libcgroup \
|
|
# extracted from bootstrap.sh, with modified flags:
|
|
&& (test -d m4 || mkdir m4) \
|
|
&& autoreconf -fi \
|
|
&& rm -rf autom4te.cache \
|
|
&& CFLAGS="-O3" ./configure --prefix="$INSTALL_DIR" --sysconfdir=/etc --localstatedir=/var --enable-opaque-hierarchy="name=systemd" \
|
|
# actually build the thing...
|
|
&& make install
|
|
|
|
# Combine, starting from non-VM compute node image.
|
|
FROM $SRC_IMAGE as base
|
|
|
|
# Temporarily set user back to root so we can run adduser, set inittab
|
|
USER root
|
|
RUN adduser vm-informant --disabled-password --no-create-home
|
|
|
|
RUN set -e \
|
|
&& rm -f /etc/inittab \
|
|
&& touch /etc/inittab
|
|
|
|
RUN set -e \
|
|
&& echo "::sysinit:cgconfigparser -l /etc/cgconfig.conf -s 1664" >> /etc/inittab \
|
|
&& CONNSTR="dbname=postgres user=cloud_admin sslmode=disable" \
|
|
&& ARGS="--auto-restart --cgroup=neon-postgres --pgconnstr=\"$CONNSTR\"" \
|
|
&& echo "::respawn:su vm-informant -c '/usr/local/bin/vm-informant $ARGS'" >> /etc/inittab
|
|
|
|
USER postgres
|
|
|
|
ADD vm-cgconfig.conf /etc/cgconfig.conf
|
|
COPY --from=informant /usr/bin/vm-informant /usr/local/bin/vm-informant
|
|
|
|
COPY --from=libcgroup-builder /libcgroup-install/bin/* /usr/bin/
|
|
COPY --from=libcgroup-builder /libcgroup-install/lib/* /usr/lib/
|
|
COPY --from=libcgroup-builder /libcgroup-install/sbin/* /usr/sbin/
|
|
|
|
ENTRYPOINT ["/usr/sbin/cgexec", "-g", "*:neon-postgres", "/usr/local/bin/compute_ctl"]
|