docker/r10k/Dockerfile in r10k-3.4.1 vs docker/r10k/Dockerfile in r10k-3.5.0
- old
+ new
@@ -1,7 +1,8 @@
FROM alpine:3.9 as build
+# hadolint ignore=DL3018
RUN apk add --no-cache ruby git && \
mkdir /workspace
WORKDIR /workspace
COPY . /workspace
RUN gem build r10k.gemspec && \
@@ -37,16 +38,18 @@
LABEL org.label-schema.version="$version" \
org.label-schema.vcs-ref="$vcs_ref" \
org.label-schema.build-date="$build_date"
COPY --from=build /workspace/r10k.gem /
+# ignore apk and gem pinning
+# hadolint ignore=DL3018,DL3028
RUN chmod a+x /adduser.sh && \
# Add a puppet user to run r10k as for consistency with puppetserver
/adduser.sh && \
chmod +x /docker-entrypoint.sh && \
chown -R puppet: /docker-entrypoint.d /docker-entrypoint.sh && \
- apk add --no-cache ruby openssh-client git ruby-rugged curl ruby-dev make gcc musl-dev && \
- gem install --no-doc /r10k.gem json etc && \
+ apk add --no-cache ruby openssh-client git ruby-rugged curl ruby-json ruby-etc && \
+ gem install --no-doc /r10k.gem && \
rm -f /r10k.gem
USER puppet
WORKDIR /home/puppet