mirror of
https://github.com/neondatabase/neon.git
synced 2026-01-05 20:42:54 +00:00
Fix missing VM cgconfig.conf (#3718)
It was being added to the wrong stage in the dockerfile. This should fix it, and resolves an ongoing issue on staging.
This commit is contained in:
@@ -10,7 +10,6 @@ RUN set -e \
|
|||||||
&& rm -f /etc/inittab \
|
&& rm -f /etc/inittab \
|
||||||
&& touch /etc/inittab
|
&& touch /etc/inittab
|
||||||
|
|
||||||
ADD vm-cgconfig.conf /etc/cgconfig.conf
|
|
||||||
RUN set -e \
|
RUN set -e \
|
||||||
&& echo "::sysinit:cgconfigparser -l /etc/cgconfig.conf -s 1664" >> /etc/inittab \
|
&& echo "::sysinit:cgconfigparser -l /etc/cgconfig.conf -s 1664" >> /etc/inittab \
|
||||||
&& echo "::respawn:su vm-informant -c '/usr/local/bin/vm-informant --auto-restart --cgroup=neon-postgres'" >> /etc/inittab
|
&& echo "::respawn:su vm-informant -c '/usr/local/bin/vm-informant --auto-restart --cgroup=neon-postgres'" >> /etc/inittab
|
||||||
@@ -26,6 +25,7 @@ RUN apt update && \
|
|||||||
RUN adduser vm-informant --disabled-password --no-create-home
|
RUN adduser vm-informant --disabled-password --no-create-home
|
||||||
USER postgres
|
USER postgres
|
||||||
|
|
||||||
|
ADD vm-cgconfig.conf /etc/cgconfig.conf
|
||||||
COPY --from=informant /etc/inittab /etc/inittab
|
COPY --from=informant /etc/inittab /etc/inittab
|
||||||
COPY --from=informant /usr/bin/vm-informant /usr/local/bin/vm-informant
|
COPY --from=informant /usr/bin/vm-informant /usr/local/bin/vm-informant
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user