lib/generators/templates/Dockerfile.erb in dockerfile-rails-1.6.17 vs lib/generators/templates/Dockerfile.erb in dockerfile-rails-1.6.18

- old
+ new

@@ -6,13 +6,13 @@ <%= render partial: 'node_client' %> <% end -%> <% if options.fullstaq -%> -FROM <%= platform %>quay.io/evl.ms/fullstaq-ruby:${RUBY_VERSION}-<%= options.jemalloc ? 'jemalloc-' : 'malloctrim-' %><%= variant %><% unless options.precompile == "defer" %> as base<% end %> +FROM <%= platform %>quay.io/evl.ms/fullstaq-ruby:${RUBY_VERSION}-<%= options.jemalloc ? 'jemalloc-' : 'malloctrim-' %><%= variant %><% unless options.precompile == "defer" %> AS base<% end %> <% else -%> -FROM <%= platform %><%= options.registry %>ruby:$RUBY_VERSION-<%= variant %><% unless options.precompile == "defer" %> as base<% end %> +FROM <%= platform %><%= options.registry %>ruby:$RUBY_VERSION-<%= variant %><% unless options.precompile == "defer" %> AS base<% end %> <% end -%> <% unless options.label.empty? -%> <% options.label.each do |key, value| -%> LABEL <%= key =~ /^\w[.\w]*$/ ? key : key.inspect %>=<%= value.inspect %> @@ -48,19 +48,19 @@ <% end -%> <% unless options.precompile == "defer" -%> # Throw-away build stage<%= parallel? ? 's' : '' %> to reduce size of final image -FROM base as <%= parallel? ? 'pre' : '' %>build +FROM base AS <%= parallel? ? 'pre' : '' %>build <% end -%> # Install packages needed to build gems<%= using_node? ? " and node modules" : "" %> <%= render partial: 'apt_install', locals: {packages: build_packages, clean: false, repos: ''} %> <% if parallel? -%> -FROM prebuild as <% if using_bun? %>bun<% else %>node<% end %> +FROM prebuild AS <% if using_bun? %>bun<% else %>node<% end %> <% end -%> <% if using_bun? and (!using_execjs? || File.exist?('bun.lockb')) -%> <%= render partial: 'install_node', locals: {bun_version: using_execjs? ? nil : bun_version} %> @@ -70,10 +70,10 @@ <% end -%> <% if parallel? -%> <%= render partial: 'npm_install', locals: {sources: Dir[*%w(package.json yarn.lock bun.lockb)]} %> -FROM prebuild as build +FROM prebuild AS build <% end -%> <% unless build_args.empty? -%> # Build arguments ARG <%= build_args.map {|key, value| "#{key}=#{value.inspect}"}.join(" \\\n ") %>