From f31ecaf8f593dae1980fa9ba97a66b8192c08652 Mon Sep 17 00:00:00 2001 From: Will Mathewson Date: Wed, 17 Jul 2024 11:53:00 +0100 Subject: [PATCH] Use upper-case for "as" in FROM ... AS instruction One of the build checks for Docker is [`FromAsCasing`](https://docs.docker.com/reference/build-checks/from-as-casing/) which has been showing up as warnings when deploying. Given `FROM` is already capitalised, `AS` should also be capitalised. --- lib/generators/templates/Dockerfile.erb | 10 +++++----- lib/generators/templates/_node_client.erb | 2 +- test/results/alpine/Dockerfile | 4 ++-- test/results/api/Dockerfile | 6 +++--- test/results/bin_cd/Dockerfile | 4 ++-- test/results/bun/Dockerfile | 4 ++-- test/results/cache/Dockerfile | 4 ++-- test/results/ci/Dockerfile | 4 ++-- test/results/config/Dockerfile | 4 ++-- test/results/env/Dockerfile | 4 ++-- test/results/esbuild/Dockerfile | 4 ++-- test/results/execjs_importmap/Dockerfile | 4 ++-- test/results/execjs_node/Dockerfile | 4 ++-- test/results/fullstaq/Dockerfile | 4 ++-- test/results/grover/Dockerfile | 4 ++-- test/results/idle/Dockerfile | 4 ++-- test/results/jemalloc/Dockerfile | 4 ++-- test/results/label/Dockerfile | 4 ++-- test/results/litefs/Dockerfile | 4 ++-- test/results/litestack/Dockerfile | 4 ++-- test/results/minimal/Dockerfile | 4 ++-- test/results/mysql/Dockerfile | 4 ++-- test/results/nginx/Dockerfile | 4 ++-- test/results/no_precompiled_gems/Dockerfile | 4 ++-- test/results/no_prep/Dockerfile | 4 ++-- test/results/parallel/Dockerfile | 8 ++++---- test/results/postgresql/Dockerfile | 4 ++-- test/results/private_gemserver/Dockerfile | 4 ++-- test/results/private_gemserver_with_cache/Dockerfile | 4 ++-- test/results/redis/Dockerfile | 4 ++-- test/results/rmagick/Dockerfile | 4 ++-- test/results/shrine/Dockerfile | 4 ++-- test/results/sidekiq/Dockerfile | 4 ++-- test/results/solid_queue/Dockerfile | 4 ++-- test/results/sqlite3/Dockerfile | 4 ++-- test/results/swap/Dockerfile | 4 ++-- test/results/thruster/Dockerfile | 4 ++-- test/results/trilogy/Dockerfile | 4 ++-- test/results/vite/Dockerfile | 4 ++-- test/results/windows/Dockerfile | 4 ++-- test/results/yjit/Dockerfile | 4 ++-- 41 files changed, 87 insertions(+), 87 deletions(-) diff --git a/lib/generators/templates/Dockerfile.erb b/lib/generators/templates/Dockerfile.erb index 61fa195..151c8b0 100644 --- a/lib/generators/templates/Dockerfile.erb +++ b/lib/generators/templates/Dockerfile.erb @@ -8,9 +8,9 @@ ARG RUBY_VERSION=<%= RUBY_VERSION %> <% 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? -%> @@ -50,7 +50,7 @@ RUN gem update --system <% if RUBY_VERSION.start_with? '2' %>3.4.22 <% end %>--n <% 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" : "" %> @@ -58,7 +58,7 @@ FROM base as <%= parallel? ? 'pre' : '' %>build <% 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')) -%> @@ -72,7 +72,7 @@ FROM prebuild as <% if using_bun? %>bun<% else %>node<% end %> <%= 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? -%> diff --git a/lib/generators/templates/_node_client.erb b/lib/generators/templates/_node_client.erb index 164160d..3db8963 100644 --- a/lib/generators/templates/_node_client.erb +++ b/lib/generators/templates/_node_client.erb @@ -1,6 +1,6 @@ ARG NODE_VERSION=<%= node_version %> -FROM <%= platform %>node:$NODE_VERSION-slim as client +FROM <%= platform %>node:$NODE_VERSION-slim AS client WORKDIR /rails/<%= api_client_dir %> diff --git a/test/results/alpine/Dockerfile b/test/results/alpine/Dockerfile index 275c5e8..65fca0c 100644 --- a/test/results/alpine/Dockerfile +++ b/test/results/alpine/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-alpine as base +FROM ruby:$RUBY_VERSION-alpine AS base # Rails app lives here WORKDIR /rails @@ -24,7 +24,7 @@ RUN apk update && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems and node modules RUN apk update && \ diff --git a/test/results/api/Dockerfile b/test/results/api/Dockerfile index 24cbffb..9c7dbe7 100644 --- a/test/results/api/Dockerfile +++ b/test/results/api/Dockerfile @@ -4,7 +4,7 @@ ARG RUBY_VERSION=xxx ARG NODE_VERSION=xxx -FROM node:$NODE_VERSION-slim as client +FROM node:$NODE_VERSION-slim AS client WORKDIR /rails/my-app @@ -19,7 +19,7 @@ COPY --link my-app . RUN npm run build -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -36,7 +36,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ diff --git a/test/results/bin_cd/Dockerfile b/test/results/bin_cd/Dockerfile index ef5b097..b2cafbb 100644 --- a/test/results/bin_cd/Dockerfile +++ b/test/results/bin_cd/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -19,7 +19,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ diff --git a/test/results/bun/Dockerfile b/test/results/bun/Dockerfile index bfcfb08..2f9ce9b 100644 --- a/test/results/bun/Dockerfile +++ b/test/results/bun/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -19,7 +19,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ diff --git a/test/results/cache/Dockerfile b/test/results/cache/Dockerfile index 8bb56c6..77fee7c 100644 --- a/test/results/cache/Dockerfile +++ b/test/results/cache/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -19,7 +19,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems and node modules RUN --mount=type=cache,id=dev-apt-cache,sharing=locked,target=/var/cache/apt \ diff --git a/test/results/ci/Dockerfile b/test/results/ci/Dockerfile index 0c29588..55b4089 100644 --- a/test/results/ci/Dockerfile +++ b/test/results/ci/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -19,7 +19,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ diff --git a/test/results/config/Dockerfile b/test/results/config/Dockerfile index a33a32e..874e187 100644 --- a/test/results/config/Dockerfile +++ b/test/results/config/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM quay.io/evl.ms/fullstaq-ruby:${RUBY_VERSION}-malloctrim-slim as base +FROM quay.io/evl.ms/fullstaq-ruby:${RUBY_VERSION}-malloctrim-slim AS base # Rails app lives here WORKDIR /rails @@ -19,7 +19,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ diff --git a/test/results/env/Dockerfile b/test/results/env/Dockerfile index 4158c91..85b0826 100644 --- a/test/results/env/Dockerfile +++ b/test/results/env/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -19,7 +19,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ diff --git a/test/results/esbuild/Dockerfile b/test/results/esbuild/Dockerfile index d04fb4d..49d03fd 100644 --- a/test/results/esbuild/Dockerfile +++ b/test/results/esbuild/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -19,7 +19,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems and node modules RUN apt-get update -qq && \ diff --git a/test/results/execjs_importmap/Dockerfile b/test/results/execjs_importmap/Dockerfile index 18d0840..50ee202 100644 --- a/test/results/execjs_importmap/Dockerfile +++ b/test/results/execjs_importmap/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -31,7 +31,7 @@ RUN curl -sL https://github.com/nodenv/node-build/archive/master.tar.gz | tar xz # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ diff --git a/test/results/execjs_node/Dockerfile b/test/results/execjs_node/Dockerfile index 7535d81..84d95fd 100644 --- a/test/results/execjs_node/Dockerfile +++ b/test/results/execjs_node/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -31,7 +31,7 @@ RUN curl -sL https://github.com/nodenv/node-build/archive/master.tar.gz | tar xz # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems and node modules RUN apt-get update -qq && \ diff --git a/test/results/fullstaq/Dockerfile b/test/results/fullstaq/Dockerfile index b13f512..69898f9 100644 --- a/test/results/fullstaq/Dockerfile +++ b/test/results/fullstaq/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM quay.io/evl.ms/fullstaq-ruby:${RUBY_VERSION}-malloctrim-slim as base +FROM quay.io/evl.ms/fullstaq-ruby:${RUBY_VERSION}-malloctrim-slim AS base # Rails app lives here WORKDIR /rails @@ -19,7 +19,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ diff --git a/test/results/grover/Dockerfile b/test/results/grover/Dockerfile index 6d33682..f053ab9 100644 --- a/test/results/grover/Dockerfile +++ b/test/results/grover/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -31,7 +31,7 @@ RUN curl -sL https://github.com/nodenv/node-build/archive/master.tar.gz | tar xz # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems and node modules RUN apt-get update -qq && \ diff --git a/test/results/idle/Dockerfile b/test/results/idle/Dockerfile index d00b385..4d809e0 100644 --- a/test/results/idle/Dockerfile +++ b/test/results/idle/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -29,7 +29,7 @@ RUN apt-get update -qq && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ diff --git a/test/results/jemalloc/Dockerfile b/test/results/jemalloc/Dockerfile index 4c0a2e3..c1ca819 100644 --- a/test/results/jemalloc/Dockerfile +++ b/test/results/jemalloc/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM --platform=linux/amd64 ruby:$RUBY_VERSION-slim as base +FROM --platform=linux/amd64 ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -19,7 +19,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ diff --git a/test/results/label/Dockerfile b/test/results/label/Dockerfile index ac02ce5..a0d276e 100644 --- a/test/results/label/Dockerfile +++ b/test/results/label/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base LABEL runtime="rails" @@ -21,7 +21,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ diff --git a/test/results/litefs/Dockerfile b/test/results/litefs/Dockerfile index 493231e..994cc07 100644 --- a/test/results/litefs/Dockerfile +++ b/test/results/litefs/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -19,7 +19,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ diff --git a/test/results/litestack/Dockerfile b/test/results/litestack/Dockerfile index a4ef031..f061f12 100644 --- a/test/results/litestack/Dockerfile +++ b/test/results/litestack/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -20,7 +20,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ diff --git a/test/results/minimal/Dockerfile b/test/results/minimal/Dockerfile index b3f7949..d8452ae 100644 --- a/test/results/minimal/Dockerfile +++ b/test/results/minimal/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -19,7 +19,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ diff --git a/test/results/mysql/Dockerfile b/test/results/mysql/Dockerfile index fbcd196..59a94f9 100644 --- a/test/results/mysql/Dockerfile +++ b/test/results/mysql/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -19,7 +19,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ diff --git a/test/results/nginx/Dockerfile b/test/results/nginx/Dockerfile index 37ac92e..d35e9ed 100644 --- a/test/results/nginx/Dockerfile +++ b/test/results/nginx/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -19,7 +19,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ diff --git a/test/results/no_precompiled_gems/Dockerfile b/test/results/no_precompiled_gems/Dockerfile index 51fee44..ea1321a 100644 --- a/test/results/no_precompiled_gems/Dockerfile +++ b/test/results/no_precompiled_gems/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -19,7 +19,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ diff --git a/test/results/no_prep/Dockerfile b/test/results/no_prep/Dockerfile index 7f9317b..493d97e 100644 --- a/test/results/no_prep/Dockerfile +++ b/test/results/no_prep/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -19,7 +19,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ diff --git a/test/results/parallel/Dockerfile b/test/results/parallel/Dockerfile index 95a1935..27aecff 100644 --- a/test/results/parallel/Dockerfile +++ b/test/results/parallel/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -19,14 +19,14 @@ RUN gem update --system --no-document && \ # Throw-away build stages to reduce size of final image -FROM base as prebuild +FROM base AS prebuild # Install packages needed to build gems and node modules RUN apt-get update -qq && \ apt-get install --no-install-recommends -y build-essential curl node-gyp pkg-config python-is-python3 -FROM prebuild as node +FROM prebuild AS node # Install JavaScript dependencies ARG NODE_VERSION=xxx @@ -42,7 +42,7 @@ COPY --link package.json yarn.lock ./ RUN yarn install --frozen-lockfile -FROM prebuild as build +FROM prebuild AS build # Install application gems COPY --link Gemfile Gemfile.lock ./ diff --git a/test/results/postgresql/Dockerfile b/test/results/postgresql/Dockerfile index 9eea2fc..ad69854 100644 --- a/test/results/postgresql/Dockerfile +++ b/test/results/postgresql/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -19,7 +19,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ diff --git a/test/results/private_gemserver/Dockerfile b/test/results/private_gemserver/Dockerfile index 218fbe0..98a889f 100644 --- a/test/results/private_gemserver/Dockerfile +++ b/test/results/private_gemserver/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -19,7 +19,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ diff --git a/test/results/private_gemserver_with_cache/Dockerfile b/test/results/private_gemserver_with_cache/Dockerfile index 3c05480..fb898c7 100644 --- a/test/results/private_gemserver_with_cache/Dockerfile +++ b/test/results/private_gemserver_with_cache/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -19,7 +19,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN --mount=type=cache,id=dev-apt-cache,sharing=locked,target=/var/cache/apt \ diff --git a/test/results/redis/Dockerfile b/test/results/redis/Dockerfile index d65c392..4c4c915 100644 --- a/test/results/redis/Dockerfile +++ b/test/results/redis/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -19,7 +19,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ diff --git a/test/results/rmagick/Dockerfile b/test/results/rmagick/Dockerfile index 65f31ee..e0b94e1 100644 --- a/test/results/rmagick/Dockerfile +++ b/test/results/rmagick/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -19,7 +19,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ diff --git a/test/results/shrine/Dockerfile b/test/results/shrine/Dockerfile index b3f7949..d8452ae 100644 --- a/test/results/shrine/Dockerfile +++ b/test/results/shrine/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -19,7 +19,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ diff --git a/test/results/sidekiq/Dockerfile b/test/results/sidekiq/Dockerfile index d9d5b52..eb2a5fe 100644 --- a/test/results/sidekiq/Dockerfile +++ b/test/results/sidekiq/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -19,7 +19,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ diff --git a/test/results/solid_queue/Dockerfile b/test/results/solid_queue/Dockerfile index d9d5b52..eb2a5fe 100644 --- a/test/results/solid_queue/Dockerfile +++ b/test/results/solid_queue/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -19,7 +19,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ diff --git a/test/results/sqlite3/Dockerfile b/test/results/sqlite3/Dockerfile index d65c392..4c4c915 100644 --- a/test/results/sqlite3/Dockerfile +++ b/test/results/sqlite3/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -19,7 +19,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ diff --git a/test/results/swap/Dockerfile b/test/results/swap/Dockerfile index 903ff6a..f81ef17 100644 --- a/test/results/swap/Dockerfile +++ b/test/results/swap/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -19,7 +19,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ diff --git a/test/results/thruster/Dockerfile b/test/results/thruster/Dockerfile index 18f25b6..c544430 100644 --- a/test/results/thruster/Dockerfile +++ b/test/results/thruster/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -19,7 +19,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ diff --git a/test/results/trilogy/Dockerfile b/test/results/trilogy/Dockerfile index 3d56f56..d673f82 100644 --- a/test/results/trilogy/Dockerfile +++ b/test/results/trilogy/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -19,7 +19,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ diff --git a/test/results/vite/Dockerfile b/test/results/vite/Dockerfile index 9a35d76..4038ea9 100644 --- a/test/results/vite/Dockerfile +++ b/test/results/vite/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -19,7 +19,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems and node modules RUN apt-get update -qq && \ diff --git a/test/results/windows/Dockerfile b/test/results/windows/Dockerfile index 29dc254..8b5007f 100644 --- a/test/results/windows/Dockerfile +++ b/test/results/windows/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -19,7 +19,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \ diff --git a/test/results/yjit/Dockerfile b/test/results/yjit/Dockerfile index 24f90bb..72c3d29 100644 --- a/test/results/yjit/Dockerfile +++ b/test/results/yjit/Dockerfile @@ -2,7 +2,7 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile ARG RUBY_VERSION=xxx -FROM ruby:$RUBY_VERSION-slim as base +FROM ruby:$RUBY_VERSION-slim AS base # Rails app lives here WORKDIR /rails @@ -19,7 +19,7 @@ RUN gem update --system --no-document && \ # Throw-away build stage to reduce size of final image -FROM base as build +FROM base AS build # Install packages needed to build gems RUN apt-get update -qq && \