Skip to content

Commit

Permalink
Small comment fixes to dockerfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
nmaludy committed Feb 15, 2021
1 parent 77eaee6 commit e0ec184
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions build/centos7-puppet7/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# usage (from the root of the puppet-st2/ directory):
# docker build -t stackstorm/puppet-st2-puppet6 -f build/puppet6/Dockerfile .
# docker build -t stackstorm/puppet-st2-puppet7 -f build/puppet7/Dockerfile .

FROM stackstorm/packagingtest:centos7-systemd

Expand Down Expand Up @@ -30,7 +30,7 @@ WORKDIR $APP_HOME
COPY . $APP_HOME

# use bundler to install our gems
ENV PUPPET_GEM_VERSION "~> 6.0"
ENV PUPPET_GEM_VERSION "~> 7.0"
ENV BUNDLE_GEMFILE=$APP_HOME/Gemfile \
BUNDLE_JOBS=2 \
BUNDLE_PATH=/bundle
Expand Down
4 changes: 2 additions & 2 deletions build/centos7-puppet7/Dockerfile.kitchen
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# usage (from the root of the puppet-st2/ directory):
# docker build -t stackstorm/puppet-st2-puppet6 -f build/puppet6/Dockerfile.kitchen .
# docker build -t stackstorm/puppet-st2-puppet7 -f build/puppet7/Dockerfile.kitchen .

FROM stackstorm/packagingtest:centos7-systemd

Expand Down Expand Up @@ -32,6 +32,6 @@ RUN ln -s /opt/puppetlabs/bin/hiera /usr/bin/
RUN ln -s /opt/puppetlabs/bin/mco /usr/bin/
RUN ln -s /opt/puppetlabs/bin/puppet /usr/bin/

# print versions (ruby 2.5.x, puppet 6.x)
# print versions (ruby 2.5.x, puppet 7.x)
RUN puppet --version
RUN sudo -E puppet --version
2 changes: 1 addition & 1 deletion build/ubuntu18-puppet7/Dockerfile.kitchen
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# usage (from the root of the puppet-st2/ directory):
# docker build -t stackstorm/puppet-st2-ubuntu18-puppet7 -f build/ubuntu18-puppet6/Dockerfile.kitchen .
# docker build -t stackstorm/puppet-st2-ubuntu18-puppet7 -f build/ubuntu18-puppet7/Dockerfile.kitchen .

FROM stackstorm/packagingtest:bionic-systemd

Expand Down

0 comments on commit e0ec184

Please sign in to comment.