Skip to content

Commit

Permalink
Correctly mount secrets
Browse files Browse the repository at this point in the history
According to the [Dockerfile reference for RUN --mount=type=secret](https://docs.docker.com/reference/dockerfile/#run---mounttypesecret), the parameter specifying the destination is supposed to be named `target`, not `dst`
  • Loading branch information
cypher committed Apr 23, 2024
1 parent 5c8e349 commit 9f38846
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions lib/generators/templates/Dockerfile.erb
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ COPY<% if options.link? %> --link<% end %> Gemfile Gemfile.lock <% if references
<% if options.cache? -%>
RUN --mount=type=cache,id=bld-gem-cache,sharing=locked,target=/srv/vendor \
<% if private_gemserver_env_variable_name -%>
--mount=type=secret,id=gemserver_credentials,dst=/kaniko/gemserver_credentials \
--mount=type=secret,id=gemserver_credentials,target=/kaniko/gemserver_credentials \
<%= private_gemserver_env_variable_name %>="$(cat /kaniko/gemserver_credentials)" && \
export <%= private_gemserver_env_variable_name %> && \
<% end -%>
Expand All @@ -107,7 +107,7 @@ RUN --mount=type=cache,id=bld-gem-cache,sharing=locked,target=/srv/vendor \

<% else -%>
<% if private_gemserver_env_variable_name -%>
RUN --mount=type=secret,id=gemserver_credentials,dst=/kaniko/gemserver_credentials \
RUN --mount=type=secret,id=gemserver_credentials,target=/kaniko/gemserver_credentials \
<%= private_gemserver_env_variable_name %>="$(cat /kaniko/gemserver_credentials)" && \
export <%= private_gemserver_env_variable_name %> && \
bundle install<% if depend_on_bootsnap? && options.precompile != "defer" -%> && \
Expand Down
2 changes: 1 addition & 1 deletion test/results/private_gemserver/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN apt-get update -qq && \

# Install application gems
COPY --link Gemfile Gemfile.lock ./
RUN --mount=type=secret,id=gemserver_credentials,dst=/kaniko/gemserver_credentials \
RUN --mount=type=secret,id=gemserver_credentials,target=/kaniko/gemserver_credentials \
BUNDLE_GEMS__EXAMPLE__COM="$(cat /kaniko/gemserver_credentials)" && \
export BUNDLE_GEMS__EXAMPLE__COM && \
bundle install && \
Expand Down
2 changes: 1 addition & 1 deletion test/results/private_gemserver_with_cache/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ RUN --mount=type=cache,id=dev-apt-cache,sharing=locked,target=/var/cache/apt \
# Install application gems
COPY --link Gemfile Gemfile.lock ./
RUN --mount=type=cache,id=bld-gem-cache,sharing=locked,target=/srv/vendor \
--mount=type=secret,id=gemserver_credentials,dst=/kaniko/gemserver_credentials \
--mount=type=secret,id=gemserver_credentials,target=/kaniko/gemserver_credentials \
BUNDLE_GEMS__EXAMPLE__COM="$(cat /kaniko/gemserver_credentials)" && \
export BUNDLE_GEMS__EXAMPLE__COM && \
bundle config set app_config .bundle && \
Expand Down

0 comments on commit 9f38846

Please sign in to comment.