File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -71,6 +71,7 @@ ENV AUTOSIGN=true \
7171 USE_OPENVOXDB=true
7272
7373COPY container-entrypoint.sh \
74+ docker-entrypoint.sh \
7475 healthcheck.sh \
7576 Containerfile \
7677 /
@@ -86,7 +87,7 @@ RUN apt-get update && \
8687
8788RUN groupadd -g ${OPENVOX_USER_GID} puppet && \
8889 useradd -m -u ${OPENVOX_USER_UID} -g puppet puppet && \
89- chmod +x /container-entrypoint.sh /healthcheck.sh /container-entrypoint.d/*.sh && \
90+ chmod +x /container-entrypoint.sh /docker-entrypoint.sh / healthcheck.sh /container-entrypoint.d/*.sh && \
9091 apt-get update && \
9192 apt-get upgrade -y && \
9293 apt-get install -y \
Original file line number Diff line number Diff line change @@ -165,6 +165,7 @@ COPY --from=build /var/log/puppetlabs /var/log/puppetlabs
165165COPY --from=build /var/run/puppetlabs /var/run/puppetlabs
166166
167167COPY container-entrypoint.sh \
168+ docker-entrypoint.sh \
168169 healthcheck.sh \
169170 Containerfile.alpine \
170171 /
@@ -210,7 +211,7 @@ RUN apk update \
210211&& chmod 700 ${data_dir}/puppetserver/yaml \
211212&& find /etc/puppetlabs/puppet/ssl -type d -print0 | xargs -0 chmod 770 \
212213&& echo 'alias ll="ls -la --color=auto"' >> ~/.bashrc \
213- && chmod +x /container-entrypoint.sh /healthcheck.sh /container-entrypoint.d/*.sh \
214+ && chmod +x /container-entrypoint.sh /docker-entrypoint.sh / healthcheck.sh /container-entrypoint.d/*.sh \
214215&& mkdir -p /opt/puppetlabs/puppet/bin \
215216&& ln -s /usr/bin/puppet /opt/puppetlabs/puppet/bin/puppet \
216217&& ln -s /usr/bin/facter /opt/puppetlabs/puppet/bin/facter \
Original file line number Diff line number Diff line change 1+ #! /bin/bash
2+ # bash is required to pass ENV vars with dots as sh cannot
3+
4+ set -o errexit # exit on any command failure; use `whatever || true` to accept failures
5+ # use `if something; then` instead of `something; if [ $? -eq 0 ]; then`
6+ # use `rv=0; something || rv=$?` if you really need the exact exit code
7+ set -o pipefail # pipes fail when any command fails, not just the last one. Use: ( whatever || true ) | somethingelse
8+ set -o nounset # exit on use of undeclared var, use `${possibly_undefined-}` to substitute the empty string in that case
9+ # You can assign default values like this:
10+ # `: ${possibly_undefined=default}`
11+ # `: ${possibly_undefined_or_empty:=default}` will also replace an empty (but declared) value
12+ # set -o xtrace
13+
14+ echoerr () { echo " $@ " 1>&2 ; }
15+
16+ echoerr " DEPRECATED: Use /container-entrypoint.sh instead of /docker-entrypoint.sh"
17+ ./container-entrypoint.sh " $@ "
You can’t perform that action at this time.
0 commit comments