Skip to content

Commit

Permalink
Upgrade to Puppet 5
Browse files Browse the repository at this point in the history
  • Loading branch information
vladgh committed Jul 1, 2017
1 parent 10d7383 commit c871699
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions puppet/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ LABEL maintainer "Vlad Ghinea vlad@ghn.me"

# Environment
ENV PATH=/opt/puppetlabs/puppet/bin:/opt/puppetlabs/bin:/usr/local/bin:$PATH \
PUPPET_RELEASE="puppetlabs-release-pc1-xenial" \
PUPPET_AGENT_VERSION="1.10.1" \
TINI_VERSION="v0.14.0"
PUPPET_RELEASE="puppet5-release-xenial" \
PUPPET_AGENT_VERSION="5.0.0" \
TINI_VERSION="0.14.0"

# Install Puppet release package
RUN export DEBIAN_FRONTEND=noninteractive && \
Expand All @@ -18,7 +18,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get -y clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

# Tini
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini
ADD https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini /sbin/tini
RUN chmod +x /sbin/tini

# Entrypoint
Expand Down
2 changes: 1 addition & 1 deletion puppetdb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ LABEL maintainer "Vlad Ghinea vlad@ghn.me"

# Environment
ENV PATH=/opt/puppetlabs/server/bin:$PATH \
PUPPETDB_VERSION="4.4.0" \
PUPPETDB_VERSION="5.0.1" \
PUPPETDB_JAVA_ARGS="-Djava.net.preferIPv4Stack=true -Xms256M -Xmx256M"

# Installation
Expand Down
2 changes: 1 addition & 1 deletion puppetserver/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ LABEL maintainer "Vlad Ghinea vlad@ghn.me"

# Environment
ENV PATH=/opt/puppetlabs/server/bin:$PATH \
PUPPETSERVER_VERSION="2.7.2" \
PUPPETSERVER_VERSION="5.0.0" \
PUPPETSERVER_JAVA_ARGS="-Xms256M -Xmx256M"

# Installation
Expand Down
2 changes: 1 addition & 1 deletion puppetserverdb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM vladgh/puppetserver:latest
LABEL maintainer "Vlad Ghinea vlad@ghn.me"

# Environment
ENV PUPPETDB_TERMINUS_VERSION="4.4.0"
ENV PUPPETDB_TERMINUS_VERSION="5.0.1"

# Installation
RUN export DEBIAN_FRONTEND=noninteractive && \
Expand Down

0 comments on commit c871699

Please sign in to comment.