From 8b0773f5158dfdfcb539b3e00bb6d9169ab778b2 Mon Sep 17 00:00:00 2001 From: "Alex Ellis (OpenFaaS Ltd)" Date: Wed, 31 Jul 2024 12:42:14 +0100 Subject: [PATCH] Update casing for "as" keyword in Dockerfile There is now a noisy linting warning about it being lowercase. Changing to uppercase makes the warning go away. Signed-off-by: Alex Ellis (OpenFaaS Ltd) --- template/bun/Dockerfile | 4 ++-- template/csharp/Dockerfile | 4 ++-- template/dockerfile/function/Dockerfile | 2 +- template/java11/Dockerfile | 6 +++--- template/node/Dockerfile | 4 ++-- template/node14/Dockerfile | 4 ++-- template/node16/Dockerfile | 4 ++-- template/node17/Dockerfile | 4 ++-- template/node18/Dockerfile | 4 ++-- template/node20/Dockerfile | 4 ++-- template/php7/Dockerfile | 2 +- template/php8/Dockerfile | 2 +- template/python3-debian/Dockerfile | 2 +- template/python3/Dockerfile | 2 +- template/ruby/Dockerfile | 2 +- 15 files changed, 25 insertions(+), 25 deletions(-) diff --git a/template/bun/Dockerfile b/template/bun/Dockerfile index bace3c11..8fdde90d 100644 --- a/template/bun/Dockerfile +++ b/template/bun/Dockerfile @@ -1,5 +1,5 @@ -FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.10.4 as watchdog -FROM --platform=${TARGETPLATFORM:-linux/amd64} oven/bun:1.0-alpine as ship +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.10.4 AS watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} oven/bun:1.0-alpine AS ship ARG TARGETPLATFORM ARG BUILDPLATFORM diff --git a/template/csharp/Dockerfile b/template/csharp/Dockerfile index 9960f237..efbd46b9 100644 --- a/template/csharp/Dockerfile +++ b/template/csharp/Dockerfile @@ -1,6 +1,6 @@ -FROM ghcr.io/openfaas/classic-watchdog:0.3.1 as watchdog +FROM ghcr.io/openfaas/classic-watchdog:0.3.1 AS watchdog -FROM mcr.microsoft.com/dotnet/core/sdk:3.1 as builder +FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS builder # Supress collection of data. ENV DOTNET_CLI_TELEMETRY_OPTOUT 1 diff --git a/template/dockerfile/function/Dockerfile b/template/dockerfile/function/Dockerfile index 0a520112..069b77d2 100644 --- a/template/dockerfile/function/Dockerfile +++ b/template/dockerfile/function/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/openfaas/classic-watchdog:0.3.1 as watchdog +FROM ghcr.io/openfaas/classic-watchdog:0.3.1 AS watchdog FROM alpine:3.18 diff --git a/template/java11/Dockerfile b/template/java11/Dockerfile index 6ab96dc1..5dc70e77 100644 --- a/template/java11/Dockerfile +++ b/template/java11/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:11-jdk-slim as builder +FROM openjdk:11-jdk-slim AS builder ENV GRADLE_VER=6.1.1 RUN apt-get update -qqy \ @@ -28,9 +28,9 @@ COPY . /home/app/ RUN gradle build RUN find . -FROM ghcr.io/openfaas/of-watchdog:0.10.4 as watchdog +FROM ghcr.io/openfaas/of-watchdog:0.10.4 AS watchdog -FROM openjdk:11-jre-slim as ship +FROM openjdk:11-jre-slim AS ship RUN apt-get update -qqy \ && apt-get install -qqy \ --no-install-recommends \ diff --git a/template/node/Dockerfile b/template/node/Dockerfile index 8769ee57..05505d04 100644 --- a/template/node/Dockerfile +++ b/template/node/Dockerfile @@ -1,5 +1,5 @@ -FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.3.1 as watchdog -FROM --platform=${TARGETPLATFORM:-linux/amd64} node:20-alpine as ship +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.3.1 AS watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} node:20-alpine AS ship ARG TARGETPLATFORM ARG BUILDPLATFORM diff --git a/template/node14/Dockerfile b/template/node14/Dockerfile index 9f160b2e..28f93383 100644 --- a/template/node14/Dockerfile +++ b/template/node14/Dockerfile @@ -1,5 +1,5 @@ -FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.10.4 as watchdog -FROM --platform=${TARGETPLATFORM:-linux/amd64} node:14-alpine as ship +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.10.4 AS watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} node:14-alpine AS ship ARG TARGETPLATFORM ARG BUILDPLATFORM diff --git a/template/node16/Dockerfile b/template/node16/Dockerfile index 2d5f6bfd..b23e42f6 100644 --- a/template/node16/Dockerfile +++ b/template/node16/Dockerfile @@ -1,5 +1,5 @@ -FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.10.4 as watchdog -FROM --platform=${TARGETPLATFORM:-linux/amd64} node:16-alpine as ship +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.10.4 AS watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} node:16-alpine AS ship ARG TARGETPLATFORM ARG BUILDPLATFORM diff --git a/template/node17/Dockerfile b/template/node17/Dockerfile index 44440405..85c70feb 100644 --- a/template/node17/Dockerfile +++ b/template/node17/Dockerfile @@ -1,5 +1,5 @@ -FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.10.4 as watchdog -FROM --platform=${TARGETPLATFORM:-linux/amd64} node:17-alpine as ship +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.10.4 AS watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} node:17-alpine AS ship ARG TARGETPLATFORM ARG BUILDPLATFORM diff --git a/template/node18/Dockerfile b/template/node18/Dockerfile index 51c86e75..56a516e1 100644 --- a/template/node18/Dockerfile +++ b/template/node18/Dockerfile @@ -1,5 +1,5 @@ -FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.10.4 as watchdog -FROM --platform=${TARGETPLATFORM:-linux/amd64} node:18-alpine as ship +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.10.4 AS watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} node:18-alpine AS ship ARG TARGETPLATFORM ARG BUILDPLATFORM diff --git a/template/node20/Dockerfile b/template/node20/Dockerfile index 678195dd..ede00594 100644 --- a/template/node20/Dockerfile +++ b/template/node20/Dockerfile @@ -1,5 +1,5 @@ -FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.10.4 as watchdog -FROM --platform=${TARGETPLATFORM:-linux/amd64} node:20-alpine as ship +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.10.4 AS watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} node:20-alpine AS ship ARG TARGETPLATFORM ARG BUILDPLATFORM diff --git a/template/php7/Dockerfile b/template/php7/Dockerfile index 1ee08960..7fb9106a 100644 --- a/template/php7/Dockerfile +++ b/template/php7/Dockerfile @@ -1,7 +1,7 @@ ARG TARGETPLATFORM ARG BUILDPLATFORM -FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.3.1 as watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.3.1 AS watchdog # start with the official Composer image and name it FROM --platform=${TARGETPLATFORM:-linux/amd64} composer:1 AS composer diff --git a/template/php8/Dockerfile b/template/php8/Dockerfile index 4e7d6fc5..3535d797 100644 --- a/template/php8/Dockerfile +++ b/template/php8/Dockerfile @@ -1,7 +1,7 @@ ARG TARGETPLATFORM ARG BUILDPLATFORM -FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.3.1 as watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.3.1 AS watchdog # start with the official Composer image and name it FROM --platform=${TARGETPLATFORM:-linux/amd64} composer:latest AS composer diff --git a/template/python3-debian/Dockerfile b/template/python3-debian/Dockerfile index f1ddfb2c..d83355e2 100644 --- a/template/python3-debian/Dockerfile +++ b/template/python3-debian/Dockerfile @@ -1,5 +1,5 @@ ARG PYTHON_VERSION=3 -FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.3.1 as watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.3.1 AS watchdog FROM --platform=${TARGETPLATFORM:-linux/amd64} python:${PYTHON_VERSION} ARG TARGETPLATFORM diff --git a/template/python3/Dockerfile b/template/python3/Dockerfile index d2da08b3..3c455585 100644 --- a/template/python3/Dockerfile +++ b/template/python3/Dockerfile @@ -1,5 +1,5 @@ ARG PYTHON_VERSION=3 -FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.3.1 as watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.3.1 AS watchdog FROM --platform=${TARGETPLATFORM:-linux/amd64} python:${PYTHON_VERSION}-alpine ARG TARGETPLATFORM diff --git a/template/ruby/Dockerfile b/template/ruby/Dockerfile index 2d02280c..e6ec0147 100644 --- a/template/ruby/Dockerfile +++ b/template/ruby/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.3.1 as watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.3.1 AS watchdog FROM --platform=${TARGETPLATFORM:-linux/amd64} ruby:alpine ARG TARGETPLATFORM