Skip to content
This repository has been archived by the owner on Feb 14, 2025. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: voxpupuli/container-puppetdb
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7.3.1
Choose a base ref
...
head repository: voxpupuli/container-puppetdb
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6.17.0
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on May 4, 2021

  1. (maint) Move Docker VOLUME declarations up 

     - Since K8s always creates volumes empty, there's no need to defer
   these stages until later. It also doesn't look like the note was
   correct anymore when building with Docker 20.10 on OSX
    @Iristyle
    Iristyle committed May 4, 2021
    Copy the full SHA
    d1a784a View commit details

  2. Merge pull request #3475 from puppetlabs/maint-update-VOLUME 

    (maint) Move Docker VOLUME declarations up
    @Iristyle
    Iristyle authored May 4, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    97660c0 View commit details

Commits on May 12, 2021

  1. (PDB-5113) Log X-Uncompressed-Length value in puppetdb-access.log

    @Zak-Kent @austb
    Zak-Kent authored and austb committed May 12, 2021
    Copy the full SHA
    5b985c5 View commit details
Showing with 4 additions and 6 deletions.
  1. +3 −5 puppetdb/Dockerfile
  2. +1 −1 puppetdb/request-logging.xml
8 changes: 3 additions & 5 deletions puppetdb/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -32,6 +32,9 @@ ENV PUPPERWARE_ANALYTICS_ENABLED=false \
# -Djavax.net.debug=ssl may be particularly useful to set for debugging SSL
PUPPETDB_JAVA_ARGS="-Djava.net.preferIPv4Stack=true -Xms256m -Xmx256m -XX:+UseParallelGC -Xloggc:$LOGDIR/puppetdb_gc.log -Djdk.tls.ephemeralDHKeySize=2048"

# puppetdb data and generated certs
VOLUME /opt/puppetlabs/server/data/puppetdb

LABEL org.label-schema.maintainer="Puppet Release Team <release@puppet.com>" \
org.label-schema.vendor="Puppet" \
org.label-schema.url="https://github.com/puppetlabs/puppetdb" \
@@ -70,11 +73,6 @@ RUN apt-get update && \
chmod +x /ssl.sh /wtfc.sh /docker-entrypoint.sh /healthcheck.sh /docker-entrypoint.d/*.sh && \
dpkg -i dumb-init_"$DUMB_INIT_VERSION"_amd64.deb

# VOLUME definitions are always at end of Dockerfile to capture all written data
# Initially set this way for LCOW bug - https://github.com/moby/moby/issues/39892
# puppetdb data and generated certs
VOLUME /opt/puppetlabs/server/data/puppetdb

######################################################
# edge (build from source)
######################################################
2 changes: 1 addition & 1 deletion puppetdb/request-logging.xml
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
<totalSizeCap>1GB</totalSizeCap>
</rollingPolicy>
<encoder>
<pattern>%h %l %u [%t] "%r" %s %b "%i{Referer}" "%i{User-Agent}" %D %i{Content-Length}</pattern>
<pattern>%h %l %u [%t] "%r" %s %b "%i{Referer}" "%i{User-Agent}" %D %i{Content-Length} %header{X-Uncompressed-Length}</pattern>
</encoder>
</appender>
<appender-ref ref="FILE" />