Merge branch 'main' into doc_drop_7

Author: rwaffen

README.md

@@ -124,14 +124,15 @@ The following environment variables are supported:
 
 ## Initialization Scripts
 
-If you would like to do additional initialization, add a directory called `/docker-custom-entrypoint.d/` and fill it with `.sh` scripts.
+If you would like to do additional initialization, add a directory called `/container-custom-entrypoint.d/` and fill it with `.sh` scripts.
 
-You can also create sub-directories in `/docker-custom-entrypoint.d/` for scripts that have to run at different stages.
+You can also create sub-directories in `/container-custom-entrypoint.d/` for scripts that have to run at different stages.
 
-- `/docker-custom-entrypoint.d/` - scripts that run after the default entrypoint scripts, but before the openvoxserver service is started.
-- `/docker-custom-entrypoint.d/post-startup/` - scripts that run after the openvoxserver service is started.
-- `/docker-custom-entrypoint.d/sigterm-handler/` - scripts that run when the container receives a SIGTERM signal.
-- `/docker-custom-entrypoint.d/post-execution/` - scripts that run after the openvoxserver service has stopped.
+- `/container-custom-entrypoint.d/pre-default/` - scripts that run before the default entrypoints scripts.
+- `/container-custom-entrypoint.d/` - scripts that run after the default entrypoint scripts, but before the openvoxserver service is started.
+- `/container-custom-entrypoint.d/post-startup/` - scripts that run after the openvoxserver service is started.
+- `/container-custom-entrypoint.d/sigterm-handler/` - scripts that run when the container receives a SIGTERM signal.
+- `/container-custom-entrypoint.d/post-execution/` - scripts that run after the openvoxserver service has stopped.
 
 ## Persistence
 

openvoxserver/Containerfile

@@ -70,12 +70,13 @@ ENV AUTOSIGN=true \
     SSLDIR=/etc/puppetlabs/puppet/ssl \
     USE_OPENVOXDB=true
 
-COPY docker-entrypoint.sh \
+COPY container-entrypoint.sh \
+     docker-entrypoint.sh \
      healthcheck.sh \
      Containerfile \
      /
 
-COPY docker-entrypoint.d /docker-entrypoint.d
+COPY container-entrypoint.d /container-entrypoint.d
 COPY --from=builder /var/lib/gems/ /var/lib/gems/
 COPY --from=builder /usr/local/bin/r10k /usr/local/bin/
 
@@ -86,7 +87,7 @@ RUN apt-get update && \
 
 RUN groupadd -g ${OPENVOX_USER_GID} puppet && \
     useradd -m -u ${OPENVOX_USER_UID} -g puppet puppet && \
-    chmod +x /docker-entrypoint.sh /healthcheck.sh /docker-entrypoint.d/*.sh && \
+    chmod +x /container-entrypoint.sh /docker-entrypoint.sh /healthcheck.sh /container-entrypoint.d/*.sh && \
     apt-get update && \
     apt-get upgrade -y && \
     apt-get install -y \
@@ -120,5 +121,5 @@ HEALTHCHECK --interval=20s --timeout=15s --retries=12 --start-period=3m CMD ["/h
 # NOTE: this is just documentation on defaults
 EXPOSE 8140
 
-ENTRYPOINT ["dumb-init", "/docker-entrypoint.sh"]
+ENTRYPOINT ["dumb-init", "/container-entrypoint.sh"]
 CMD ["foreground"]

openvoxserver/Containerfile.alpine

@@ -164,14 +164,15 @@ COPY --from=build /etc/puppetlabs /etc/puppetlabs
 COPY --from=build /var/log/puppetlabs /var/log/puppetlabs
 COPY --from=build /var/run/puppetlabs /var/run/puppetlabs
 
-COPY docker-entrypoint.sh \
+COPY container-entrypoint.sh \
+     docker-entrypoint.sh \
      healthcheck.sh \
      Containerfile.alpine \
      /
 
 COPY conf.d/product.conf /etc/puppetlabs/puppetserver/conf.d/
 COPY conf.d/puppetserver.conf /etc/puppetlabs/puppetserver/conf.d/
-COPY docker-entrypoint.d /docker-entrypoint.d
+COPY container-entrypoint.d /container-entrypoint.d
 COPY logback.xml /etc/puppetlabs/puppetserver/
 COPY puppetdb.conf /var/tmp/puppet/
 COPY puppetserver /etc/default/puppetserver
@@ -210,7 +211,7 @@ RUN apk update \
 && chmod 700 ${data_dir}/puppetserver/yaml \
 && find /etc/puppetlabs/puppet/ssl -type d -print0 | xargs -0 chmod 770 \
 && echo 'alias ll="ls -la --color=auto"' >> ~/.bashrc \
-&& chmod +x /docker-entrypoint.sh /healthcheck.sh /docker-entrypoint.d/*.sh \
+&& chmod +x /container-entrypoint.sh /docker-entrypoint.sh /healthcheck.sh /container-entrypoint.d/*.sh \
 && mkdir -p /opt/puppetlabs/puppet/bin \
 && ln -s /usr/bin/puppet /opt/puppetlabs/puppet/bin/puppet \
 && ln -s /usr/bin/facter /opt/puppetlabs/puppet/bin/facter \
@@ -228,5 +229,5 @@ HEALTHCHECK --interval=20s --timeout=15s --retries=12 --start-period=3m CMD ["/h
 
 EXPOSE 8140
 
-ENTRYPOINT ["dumb-init", "/docker-entrypoint.sh"]
+ENTRYPOINT ["dumb-init", "/container-entrypoint.sh"]
 CMD ["foreground"]