docker/r10k/Dockerfile in r10k-3.1.1 vs docker/r10k/Dockerfile in r10k-3.2.0
- old
+ new
@@ -1,17 +1,16 @@
-FROM ubuntu:16.04
+FROM alpine:3.8
ARG vcs_ref
ARG build_date
ARG version="3.1.0"
# Used by entrypoint to submit metrics to Google Analytics.
# Published images should use "production" for this build_arg.
ARG pupperware_analytics_stream="dev"
ENV PUPPERWARE_ANALYTICS_STREAM="$pupperware_analytics_stream"
ENV R10K_VERSION="$version"
-ENV UBUNTU_CODENAME="xenial"
LABEL org.label-schema.maintainer="Puppet Release Team <release@puppet.com>" \
org.label-schema.vendor="Puppet" \
org.label-schema.url="https://github.com/puppetlabs/r10k" \
org.label-schema.name="r10k" \
@@ -21,29 +20,16 @@
org.label-schema.vcs-ref="$vcs_ref" \
org.label-schema.build-date="$build_date" \
org.label-schema.schema-version="1.0" \
org.label-schema.dockerfile="/Dockerfile"
-RUN apt-get update && \
- apt-get install --no-install-recommends -y wget ca-certificates lsb-release && \
- wget https://apt.puppetlabs.com/puppet5-release-"$UBUNTU_CODENAME".deb && \
- dpkg -i puppet5-release-"$UBUNTU_CODENAME".deb && \
- rm puppet5-release-"$UBUNTU_CODENAME".deb && \
- apt-get update && \
- apt-get install --no-install-recommends -y puppet-agent && \
- apt-get install --no-install-recommends -y git openssh-client && \
- apt-get remove --purge -y wget && \
- apt-get autoremove -y && \
- apt-get clean && \
- rm -rf /var/lib/apt/lists/*
+RUN apk add --no-cache ruby openssh-client git ruby-rugged curl ruby-dev make gcc musl-dev
-RUN /opt/puppetlabs/puppet/bin/gem install r10k:"$R10K_VERSION"
+RUN gem install --no-doc r10k:"$R10K_VERSION" json etc
COPY docker-entrypoint.sh /
RUN chmod +x /docker-entrypoint.sh
COPY docker-entrypoint.d /docker-entrypoint.d
-
-ENV PATH=/opt/puppetlabs/server/bin:/opt/puppetlabs/puppet/bin:/opt/puppetlabs/bin:$PATH
ENTRYPOINT ["/docker-entrypoint.sh"]
CMD ["help"]
COPY Dockerfile /