From 6b72750526a20fd18eec16b9cf1a0600cee6fa8e Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Wed, 3 Jul 2024 12:56:32 +0200 Subject: [PATCH] test: fix dockerfile casing --- test/Dockerfile.jammy | 18 +++++++-------- test/Dockerfile.noble | 18 +++++++-------- test/dart/Dockerfile | 8 +++---- test/dart/Dockerfile.arm64 | 4 ++-- test/dotnet/Dockerfile | 12 +++++----- test/dotnet/Dockerfile.arm64 | 4 ++-- test/erlang/Dockerfile | 10 ++++----- test/erlang/Dockerfile.arm64 | 6 ++--- test/flutter/Dockerfile | 14 ++++++------ test/flutter/Dockerfile.arm64 | 4 ++-- test/flux/Dockerfile | 8 +++---- test/flux/Dockerfile.arm64 | 4 ++-- test/golang/Dockerfile | 8 +++---- test/golang/Dockerfile.arm64 | 4 ++-- test/helm/Dockerfile | 14 ++++++------ test/helm/Dockerfile.arm64 | 4 ++-- test/java/Dockerfile | 18 +++++++-------- test/java/Dockerfile.arm64 | 8 +++---- test/jb/Dockerfile | 6 ++--- test/jb/Dockerfile.arm64 | 4 ++-- test/latest/Dockerfile | 14 ++++++------ test/latest/Dockerfile.arm64 | 22 +++++++++--------- test/nix/Dockerfile | 6 ++--- test/nix/Dockerfile.arm64 | 4 ++-- test/node/Dockerfile | 38 ++++++++++++++++---------------- test/node/Dockerfile.arm64 | 10 ++++----- test/php/Dockerfile | 10 ++++----- test/php/Dockerfile.arm64 | 6 ++--- test/powershell/Dockerfile | 6 ++--- test/powershell/Dockerfile.arm64 | 4 ++-- test/python/Dockerfile | 38 ++++++++++++++++---------------- test/python/Dockerfile.arm64 | 14 ++++++------ test/ruby/Dockerfile | 16 +++++++------- test/ruby/Dockerfile.arm64 | 8 +++---- test/rust/Dockerfile | 8 +++---- test/rust/Dockerfile.arm64 | 4 ++-- test/swift/Dockerfile | 8 +++---- test/swift/Dockerfile.arm64 | 4 ++-- 38 files changed, 198 insertions(+), 198 deletions(-) diff --git a/test/Dockerfile.jammy b/test/Dockerfile.jammy index 9ccfa257a..f2822607e 100644 --- a/test/Dockerfile.jammy +++ b/test/Dockerfile.jammy @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:jammy as base +FROM ubuntu:jammy AS base ARG APT_HTTP_PROXY ARG CONTAINERBASE_DEBUG @@ -20,7 +20,7 @@ RUN install-tool git v2.45.2 #-------------------------------------- # Image: build #-------------------------------------- -FROM base as build +FROM base AS build RUN uname -p | tee | grep x86_64 @@ -31,7 +31,7 @@ RUN prepare-tool all #-------------------------------------- # Image: test #-------------------------------------- -FROM build as test +FROM build AS test # renovate: datasource=github-releases packageName=bazelbuild/bazelisk RUN install-tool bazelisk v1.20.0 @@ -96,7 +96,7 @@ RUN install-tool vendir v0.40.2 #-------------------------------------- # Image: test-erlang #-------------------------------------- -FROM build as test-erlang +FROM build AS test-erlang # renovate: datasource=github-releases packageName=containerbase/erlang-prebuild versioning=docker RUN install-tool erlang 26.2.5.0 @@ -106,7 +106,7 @@ RUN install-tool elixir 1.16.3 #-------------------------------------- # Image: test-java #-------------------------------------- -FROM build as test-java +FROM build AS test-java # renovate: datasource=java-version packageName=java-jre RUN install-tool java 21.0.3+9.0.LTS @@ -116,7 +116,7 @@ RUN install-tool gradle 8.8 #-------------------------------------- # Image: test-node #-------------------------------------- -FROM build as test-node +FROM build AS test-node # renovate: datasource=node RUN install-tool node v20.15.0 @@ -128,7 +128,7 @@ RUN install-tool yarn 4.3.1 #-------------------------------------- # Image: test-php #-------------------------------------- -FROM build as test-php +FROM build AS test-php # renovate: datasource=github-releases packageName=containerbase/php-prebuild RUN install-tool php 8.3.8 @@ -138,7 +138,7 @@ RUN install-tool composer 2.7.7 #-------------------------------------- # Image: test-python #-------------------------------------- -FROM build as test-python +FROM build AS test-python # renovate: datasource=github-releases packageName=containerbase/python-prebuild RUN install-tool python 3.12.4 @@ -156,7 +156,7 @@ RUN install-tool poetry 1.8.3 #-------------------------------------- # Image: test-ruby #-------------------------------------- -FROM build as test-ruby +FROM build AS test-ruby # renovate: datasource=github-releases packageName=containerbase/ruby-prebuild versioning=ruby RUN install-tool ruby 3.3.3 diff --git a/test/Dockerfile.noble b/test/Dockerfile.noble index d0eb1eb4c..455f047d9 100644 --- a/test/Dockerfile.noble +++ b/test/Dockerfile.noble @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:noble as base +FROM ubuntu:noble AS base ARG APT_HTTP_PROXY ARG CONTAINERBASE_DEBUG @@ -20,7 +20,7 @@ RUN install-tool git v2.45.2 #-------------------------------------- # Image: build #-------------------------------------- -FROM base as build +FROM base AS build RUN uname -p | tee | grep x86_64 @@ -31,7 +31,7 @@ RUN prepare-tool all #-------------------------------------- # Image: test #-------------------------------------- -FROM build as test +FROM build AS test # renovate: datasource=github-releases packageName=bazelbuild/bazelisk RUN install-tool bazelisk v1.20.0 @@ -96,7 +96,7 @@ RUN install-tool vendir v0.40.2 #-------------------------------------- # Image: test-erlang #-------------------------------------- -FROM build as test-erlang +FROM build AS test-erlang # renovate: datasource=github-releases packageName=containerbase/erlang-prebuild versioning=docker RUN install-tool erlang 26.2.5.0 @@ -106,7 +106,7 @@ RUN install-tool elixir 1.16.3 #-------------------------------------- # Image: test-java #-------------------------------------- -FROM build as test-java +FROM build AS test-java # renovate: datasource=adoptium-java packageName=java-jre RUN install-tool java 21.0.3+9.0.LTS @@ -116,7 +116,7 @@ RUN install-tool gradle 8.8 #-------------------------------------- # Image: test-node #-------------------------------------- -FROM build as test-node +FROM build AS test-node # renovate: datasource=node RUN install-tool node v20.15.0 @@ -128,7 +128,7 @@ RUN install-tool yarn 4.3.1 #-------------------------------------- # Image: test-php #-------------------------------------- -FROM build as test-php +FROM build AS test-php # renovate: datasource=github-releases packageName=containerbase/php-prebuild RUN install-tool php 8.3.8 @@ -138,7 +138,7 @@ RUN install-tool composer 2.7.7 #-------------------------------------- # Image: test-python #-------------------------------------- -FROM build as test-python +FROM build AS test-python # renovate: datasource=github-releases packageName=containerbase/python-prebuild RUN install-tool python 3.12.4 @@ -156,7 +156,7 @@ RUN install-tool poetry 1.8.3 #-------------------------------------- # Image: test-ruby #-------------------------------------- -FROM build as test-ruby +FROM build AS test-ruby # renovate: datasource=github-releases packageName=containerbase/ruby-prebuild versioning=ruby RUN install-tool ruby 3.3.3 diff --git a/test/dart/Dockerfile b/test/dart/Dockerfile index 6a4dbbf88..214645c38 100644 --- a/test/dart/Dockerfile +++ b/test/dart/Dockerfile @@ -2,7 +2,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN touch /.dummy @@ -26,14 +26,14 @@ WORKDIR /test #-------------------------------------- # build #-------------------------------------- -FROM base as build +FROM base AS build RUN prepare-tool dart #-------------------------------------- # test: dart 2.x (non-root) #-------------------------------------- -FROM build as testa +FROM build AS testa USER 1000 @@ -51,7 +51,7 @@ RUN set -ex; \ #-------------------------------------- # test: dart 2.x (root, openstack) #-------------------------------------- -FROM base as testb +FROM base AS testb # renovate: datasource=docker RUN install-tool dart 2.19.6 diff --git a/test/dart/Dockerfile.arm64 b/test/dart/Dockerfile.arm64 index 3fd45ef43..6768c0002 100644 --- a/test/dart/Dockerfile.arm64 +++ b/test/dart/Dockerfile.arm64 @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN uname -p | tee | grep aarch64 RUN touch /.dummy @@ -23,7 +23,7 @@ RUN install-containerbase #-------------------------------------- # Image: test #-------------------------------------- -FROM base as test-dart +FROM base AS test-dart # renovate: datasource=docker RUN install-tool dart 2.19.6 diff --git a/test/dotnet/Dockerfile b/test/dotnet/Dockerfile index afc8324a0..98a87168a 100644 --- a/test/dotnet/Dockerfile +++ b/test/dotnet/Dockerfile @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN touch /.dummy @@ -25,7 +25,7 @@ WORKDIR /test #-------------------------------------- # build: dotnet 6.0 base image (LTS) #-------------------------------------- -FROM base as build +FROM base AS build RUN install-tool dotnet 6.0.416 RUN set -ex; dotnet --version | grep 6.0. @@ -42,7 +42,7 @@ RUN dotnet --info #-------------------------------------- # test: dotnet 6.0 (LTS) #-------------------------------------- -FROM build as testa +FROM build AS testa RUN set -ex; \ dotnet restore --use-lock-file @@ -55,7 +55,7 @@ RUN set -ex; \ #-------------------------------------- # test: dotnet 8.0 (LTS) #-------------------------------------- -FROM base as testb +FROM base AS testb # Do not change RUN install-tool dotnet 6.0.416 @@ -84,7 +84,7 @@ RUN set -ex; \ #-------------------------------------- # test: dotnet 8.0 (non-root, LTS) #-------------------------------------- -FROM build as testc +FROM build AS testc # only patch updates # renovate: datasource=dotnet packageName=dotnet-sdk @@ -102,7 +102,7 @@ RUN set -ex; \ #-------------------------------------- # test: dotnet latest (non-root) #-------------------------------------- -FROM build as testd +FROM build AS testd # only patch updates # renovate: datasource=dotnet packageName=dotnet-sdk diff --git a/test/dotnet/Dockerfile.arm64 b/test/dotnet/Dockerfile.arm64 index da91857c9..3a7d38e67 100644 --- a/test/dotnet/Dockerfile.arm64 +++ b/test/dotnet/Dockerfile.arm64 @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN uname -p | tee | grep aarch64 RUN touch /.dummy @@ -23,7 +23,7 @@ RUN install-containerbase #-------------------------------------- # Image: dotnet #-------------------------------------- -FROM base as test-dotnet +FROM base AS test-dotnet # renovate: datasource=dotnet packageName=dotnet-sdk RUN install-tool dotnet 8.0.302 diff --git a/test/erlang/Dockerfile b/test/erlang/Dockerfile index 6e86dba99..2a7d2c8cc 100644 --- a/test/erlang/Dockerfile +++ b/test/erlang/Dockerfile @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN touch /.dummy @@ -26,14 +26,14 @@ WORKDIR /test #-------------------------------------- # build #-------------------------------------- -FROM base as build +FROM base AS build RUN prepare-tool erlang #-------------------------------------- # test: erlang (root) #-------------------------------------- -FROM base as testa +FROM base AS testa # https://hexdocs.pm/elixir/1.15.0/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp # renovate: datasource=github-releases packageName=containerbase/erlang-prebuild versioning=docker @@ -53,7 +53,7 @@ RUN set -ex; \ #-------------------------------------- # test: erlang (v24,user,openshift) #-------------------------------------- -FROM build as testb +FROM build AS testb USER 1001 @@ -74,7 +74,7 @@ RUN set -ex; \ #-------------------------------------- # test: erlang (v22,user,openshift) #-------------------------------------- -FROM build as testc +FROM build AS testc USER 1001 diff --git a/test/erlang/Dockerfile.arm64 b/test/erlang/Dockerfile.arm64 index 2af3cdd50..5b140e189 100644 --- a/test/erlang/Dockerfile.arm64 +++ b/test/erlang/Dockerfile.arm64 @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN uname -p | tee | grep aarch64 RUN touch /.dummy @@ -23,7 +23,7 @@ RUN install-containerbase #-------------------------------------- # Image: erlang #-------------------------------------- -FROM base as test-erlang +FROM base AS test-erlang # renovate: datasource=github-releases packageName=containerbase/erlang-prebuild versioning=docker RUN install-tool erlang 26.2.5.0 @@ -31,7 +31,7 @@ RUN install-tool erlang 26.2.5.0 #-------------------------------------- # Image: elixir #-------------------------------------- -FROM test-erlang as test-elixir +FROM test-erlang AS test-elixir # renovate: datasource=docker versioning=docker RUN install-tool elixir 1.16.3 diff --git a/test/flutter/Dockerfile b/test/flutter/Dockerfile index 0993e50a2..69398d1b7 100644 --- a/test/flutter/Dockerfile +++ b/test/flutter/Dockerfile @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN touch /.dummy @@ -29,14 +29,14 @@ WORKDIR /test #-------------------------------------- # build #-------------------------------------- -FROM base as build +FROM base AS build RUN prepare-tool flutter #-------------------------------------- # test: flutter 1.x (root) #-------------------------------------- -FROM build as testa +FROM build AS testa # EOL, use source, not prebuild RUN install-tool flutter 1.22.5 @@ -55,7 +55,7 @@ RUN set -ex; \ #-------------------------------------- # test: flutter 1.x (non-root) #-------------------------------------- -FROM build as testb +FROM build AS testb USER 1000 @@ -74,7 +74,7 @@ RUN set -ex; \ #-------------------------------------- # test: flutter 2.x (non-root) #-------------------------------------- -FROM build as testc +FROM build AS testc USER 1000 @@ -88,7 +88,7 @@ RUN set -ex; \ #-------------------------------------- # test: flutter 3.x (non-root) #-------------------------------------- -FROM build as testd +FROM build AS testd USER 1000 @@ -102,7 +102,7 @@ RUN set -ex; \ #-------------------------------------- # test: flutter 3.x (non-root, openshift) #-------------------------------------- -FROM build as teste +FROM build AS teste # fix test file perms for openstack RUN chown -R 1001 . diff --git a/test/flutter/Dockerfile.arm64 b/test/flutter/Dockerfile.arm64 index 5dbe8074c..cfd8bedf1 100644 --- a/test/flutter/Dockerfile.arm64 +++ b/test/flutter/Dockerfile.arm64 @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN uname -p | tee | grep aarch64 RUN touch /.dummy @@ -27,7 +27,7 @@ RUN install-tool git v2.45.2 #-------------------------------------- # Image: flutter #-------------------------------------- -FROM base as test-flutter +FROM base AS test-flutter # renovate: datasource=flutter-version RUN install-tool flutter 3.22.2 diff --git a/test/flux/Dockerfile b/test/flux/Dockerfile index 5a174d42d..e254e5043 100644 --- a/test/flux/Dockerfile +++ b/test/flux/Dockerfile @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN touch /.dummy @@ -27,7 +27,7 @@ USER 1000 #-------------------------------------- # install flux as root #-------------------------------------- -FROM base as testa +FROM base AS testa RUN install-tool flux "${FLUX_VERSION}" @@ -38,7 +38,7 @@ RUN flux -v | grep "${FLUX_VERSION#v}" #-------------------------------------- # install flux as user #-------------------------------------- -FROM base as testb +FROM base AS testb USER 1111 @@ -51,7 +51,7 @@ RUN flux -v | grep "${FLUX_VERSION#v}" #-------------------------------------- # install flux as user when already installed #-------------------------------------- -FROM base as testc +FROM base AS testc RUN install-tool flux "${FLUX_VERSION}" diff --git a/test/flux/Dockerfile.arm64 b/test/flux/Dockerfile.arm64 index e12ce4328..c88772e49 100644 --- a/test/flux/Dockerfile.arm64 +++ b/test/flux/Dockerfile.arm64 @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN uname -p | tee | grep aarch64 RUN touch /.dummy @@ -23,7 +23,7 @@ RUN install-containerbase #-------------------------------------- # Image: flux #-------------------------------------- -FROM base as test-flux +FROM base AS test-flux # renovate: datasource=github-releases packageName=fluxcd/flux2 RUN install-tool flux v2.3.0 diff --git a/test/golang/Dockerfile b/test/golang/Dockerfile index cdf0985a0..1d7c696bc 100644 --- a/test/golang/Dockerfile +++ b/test/golang/Dockerfile @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN touch /.dummy @@ -29,7 +29,7 @@ WORKDIR /test #-------------------------------------- # test: golang #-------------------------------------- -FROM base as testa +FROM base AS testa # renovate: datasource=docker versioning=docker RUN install-tool golang 1.22.5 @@ -55,7 +55,7 @@ RUN set -ex; cd c; go get -d ./...; cat go.sum #-------------------------------------- # test: check first patch version eg v1.11.0 #-------------------------------------- -FROM base as testb +FROM base AS testb # do not update patch version RUN install-tool golang 1.11.0 @@ -73,7 +73,7 @@ RUN go env #-------------------------------------- # test: golang (non-root) #-------------------------------------- -FROM base as testc +FROM base AS testc RUN prepare-tool golang diff --git a/test/golang/Dockerfile.arm64 b/test/golang/Dockerfile.arm64 index 37f232595..2464fd8a2 100644 --- a/test/golang/Dockerfile.arm64 +++ b/test/golang/Dockerfile.arm64 @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN uname -p | tee | grep aarch64 RUN touch /.dummy @@ -27,7 +27,7 @@ RUN install-tool git v2.45.2 #-------------------------------------- # Image: golang #-------------------------------------- -FROM base as test-golang +FROM base AS test-golang # renovate: datasource=docker versioning=docker RUN install-tool golang 1.22.5 diff --git a/test/helm/Dockerfile b/test/helm/Dockerfile index 2c9ef005d..a2494f569 100644 --- a/test/helm/Dockerfile +++ b/test/helm/Dockerfile @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN touch /.dummy @@ -23,9 +23,9 @@ RUN install-containerbase ARG HELM_VERSION=3.8.0 #------------------------------------------------------------------ -# testa: install helm as root, run as both +# testa: install helm AS root, run AS both #------------------------------------------------------------------ -FROM base as testa +FROM base AS testa RUN install-tool helm "v${HELM_VERSION}" @@ -57,9 +57,9 @@ RUN helm version | grep "${HELM_VERSION}" #------------------------------------------------------------------ -# testb: install helm as user (openshift) +# testb: install helm AS user (openshift) #------------------------------------------------------------------ -FROM base as testb +FROM base AS testb USER 1111 @@ -81,9 +81,9 @@ RUN helm version | grep "${HELM_VERSION}" #------------------------------------------------------------------ -# testc: install as user when already installed as root (openshift) +# testc: install AS user when already installed AS root (openshift) #------------------------------------------------------------------ -FROM base as testc +FROM base AS testc RUN install-tool helm "v${HELM_VERSION}" diff --git a/test/helm/Dockerfile.arm64 b/test/helm/Dockerfile.arm64 index f15a7703d..b15aa3106 100644 --- a/test/helm/Dockerfile.arm64 +++ b/test/helm/Dockerfile.arm64 @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN uname -p | tee | grep aarch64 RUN touch /.dummy @@ -23,7 +23,7 @@ RUN install-containerbase #-------------------------------------- # Image: helm #-------------------------------------- -FROM base as test-helm +FROM base AS test-helm # renovate: datasource=github-releases packageName=helm/helm RUN install-tool helm v3.15.2 diff --git a/test/java/Dockerfile b/test/java/Dockerfile index 036f0fca7..9822444df 100644 --- a/test/java/Dockerfile +++ b/test/java/Dockerfile @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN touch /.dummy @@ -29,7 +29,7 @@ WORKDIR /test #-------------------------------------- # build: Java LTS base #-------------------------------------- -FROM base as build +FROM base AS build RUN prepare-tool java @@ -54,7 +54,7 @@ RUN [ "$(find /tmp -type f | wc -l)" -eq 0 ] #-------------------------------------- # test: Java 11 LTS + Gradle 6 #-------------------------------------- -FROM build as test-gradle-a +FROM build AS test-gradle-a RUN install-tool java 11.0.23+9 @@ -89,7 +89,7 @@ RUN gradle --version #-------------------------------------- # test: Java 21 LTS + Gradle 8 #-------------------------------------- -FROM base as test-gradle-b +FROM base AS test-gradle-b # renovate: datasource=adoptium-java packageName=java-jre RUN install-tool java-jre 21.0.3+9.0.LTS @@ -115,7 +115,7 @@ RUN gradle --version #-------------------------------------- # test: Java 8 LTS + Gradle 7 #-------------------------------------- -FROM build as test-gradle-c +FROM build AS test-gradle-c # need to stay old RUN install-tool java 8.0.342+7 @@ -131,7 +131,7 @@ RUN gradle --version #-------------------------------------- # test: Java 17 LTS (non-root) #-------------------------------------- -FROM base as test-gradle-d +FROM base AS test-gradle-d RUN prepare-tool java gradle @@ -153,7 +153,7 @@ RUN gradle --version | grep "${JAVA_VERSION}" #-------------------------------------- # test: maven #-------------------------------------- -FROM build as test-maven-a +FROM build AS test-maven-a # test openshift userid missmatch USER 1001 @@ -174,7 +174,7 @@ RUN set -ex; \ #-------------------------------------- # test: Scala / sbt #-------------------------------------- -FROM build as test-others +FROM build AS test-others WORKDIR / @@ -201,7 +201,7 @@ RUN set -ex; \ #-------------------------------------- # test: Resolve latest versions #-------------------------------------- -FROM base as test-latest-version +FROM base AS test-latest-version RUN install-tool java-jre RUN install-tool gradle diff --git a/test/java/Dockerfile.arm64 b/test/java/Dockerfile.arm64 index 058cef047..27fc41da1 100644 --- a/test/java/Dockerfile.arm64 +++ b/test/java/Dockerfile.arm64 @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN uname -p | tee | grep aarch64 RUN touch /.dummy @@ -23,7 +23,7 @@ RUN install-containerbase #-------------------------------------- # Image: java #-------------------------------------- -FROM base as test-java +FROM base AS test-java # renovate: datasource=java-version packageName=java-jre RUN install-tool java 21.0.3+9.0.LTS @@ -31,7 +31,7 @@ RUN install-tool java 21.0.3+9.0.LTS #-------------------------------------- # Image: java #-------------------------------------- -FROM test-java as test-gradle +FROM test-java AS test-gradle # renovate: datasource=gradle-version packageName=gradle versioning=gradle RUN install-tool gradle 8.8 @@ -39,7 +39,7 @@ RUN install-tool gradle 8.8 #-------------------------------------- # Image: maven #-------------------------------------- -FROM test-java as test-maven +FROM test-java AS test-maven # renovate: datasource=maven packageName=org.apache.maven:maven RUN install-tool maven 3.9.8 diff --git a/test/jb/Dockerfile b/test/jb/Dockerfile index c1421642d..6401a355e 100644 --- a/test/jb/Dockerfile +++ b/test/jb/Dockerfile @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN touch /.dummy @@ -25,7 +25,7 @@ WORKDIR /test #-------------------------------------- # build #-------------------------------------- -FROM base as build +FROM base AS build USER 1000 @@ -37,7 +37,7 @@ RUN install-tool jb v0.5.1 # test: jb install #-------------------------------------- -FROM build as testa +FROM build AS testa RUN set -ex; \ jb install; \ diff --git a/test/jb/Dockerfile.arm64 b/test/jb/Dockerfile.arm64 index c5f0ba1f6..1c5321791 100644 --- a/test/jb/Dockerfile.arm64 +++ b/test/jb/Dockerfile.arm64 @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN uname -p | tee | grep aarch64 RUN touch /.dummy @@ -23,7 +23,7 @@ RUN install-containerbase #-------------------------------------- # Image: jb #-------------------------------------- -FROM base as test-jb +FROM base AS test-jb # renovate: datasource=github-releases packageName=jsonnet-bundler/jsonnet-bundler RUN install-tool jb v0.5.1 diff --git a/test/latest/Dockerfile b/test/latest/Dockerfile index 985d615d5..94247deee 100644 --- a/test/latest/Dockerfile +++ b/test/latest/Dockerfile @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN touch /.dummy @@ -22,7 +22,7 @@ RUN install-containerbase #-------------------------------------- # build #-------------------------------------- -FROM base as build +FROM base AS build # install nginx for request testing RUN install-apt nginx @@ -50,7 +50,7 @@ RUN set -ex; \ #-------------------------------------- # test: custom root ca #-------------------------------------- -FROM build as testa +FROM build AS testa # renovate: datasource=node RUN install-tool node v20.15.0 @@ -109,7 +109,7 @@ RUN set -ex; \ #-------------------------------------- # test: gitpod #-------------------------------------- -FROM ubuntu:focal as testb-gitpod +FROM ubuntu:focal AS testb-gitpod ARG USER_NAME=gitpod ARG USER_ID=33333 @@ -151,7 +151,7 @@ RUN mkdir $HOME/.tf-cache && TF_PLUGIN_CACHE_DIR=$HOME/.tf-cache terraform init #-------------------------------------- # test: ignore tools #-------------------------------------- -FROM build as testc +FROM build AS testc RUN prepare-tool docker @@ -183,7 +183,7 @@ RUN install-tool docker v27.0.3 #-------------------------------------- # test: bin path has 775 #-------------------------------------- -FROM base as testd +FROM base AS testd RUN [ $(stat --format '%a' "/usr/local/bin") -eq 775 ] @@ -194,7 +194,7 @@ RUN set -ex; [ -d /usr/local/erlang ] && echo "works" || exit 1; #-------------------------------------- # test: bazelisk, bun, vendir, helmfile, kustomize #-------------------------------------- -FROM base as teste +FROM base AS teste # renovate: datasource=github-releases packageName=bazelbuild/bazelisk RUN install-tool bazelisk v1.20.0 diff --git a/test/latest/Dockerfile.arm64 b/test/latest/Dockerfile.arm64 index 6f0ddad0b..8daf80f59 100644 --- a/test/latest/Dockerfile.arm64 +++ b/test/latest/Dockerfile.arm64 @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN uname -p | tee | grep aarch64 RUN touch /.dummy @@ -23,7 +23,7 @@ RUN install-containerbase #-------------------------------------- # Image: bazelisk #-------------------------------------- -FROM base as test-bazelisk +FROM base AS test-bazelisk # renovate: datasource=github-releases packageName=bazelbuild/bazelisk RUN install-tool bazelisk v1.20.0 @@ -31,7 +31,7 @@ RUN install-tool bazelisk v1.20.0 #-------------------------------------- # Image: bun #-------------------------------------- -FROM base as test-bun +FROM base AS test-bun # renovate: datasource=npm RUN install-tool bun 1.1.17 @@ -39,7 +39,7 @@ RUN install-tool bun 1.1.17 #-------------------------------------- # Image: gleam #-------------------------------------- -FROM base as test-gleam +FROM base AS test-gleam # renovate: datasource=github-releases packageName=gleam-lang/gleam RUN install-tool gleam 1.2.1 @@ -47,7 +47,7 @@ RUN install-tool gleam 1.2.1 #-------------------------------------- # Image: docker #-------------------------------------- -FROM base as test-docker +FROM base AS test-docker # renovate: datasource=github-releases packageName=moby/moby RUN install-tool docker v27.0.3 @@ -55,7 +55,7 @@ RUN install-tool docker v27.0.3 #-------------------------------------- # Image: git #-------------------------------------- -FROM base as test-git +FROM base AS test-git # renovate: datasource=github-tags packageName=git/git RUN install-tool git v2.45.2 @@ -63,7 +63,7 @@ RUN install-tool git v2.45.2 #-------------------------------------- # Image: git-lfs #-------------------------------------- -FROM test-git as test-git-lfs +FROM test-git AS test-git-lfs # renovate: datasource=github-releases packageName=git-lfs/git-lfs RUN install-tool git-lfs v3.5.1 @@ -71,7 +71,7 @@ RUN install-tool git-lfs v3.5.1 #-------------------------------------- # Image: helmfile #-------------------------------------- -FROM base as test-helmfile +FROM base AS test-helmfile # renovate: datasource=github-releases packageName=helmfile/helmfile RUN install-tool helmfile v0.166.0 @@ -79,7 +79,7 @@ RUN install-tool helmfile v0.166.0 #-------------------------------------- # Image: kustomize #-------------------------------------- -FROM base as test-kustomize +FROM base AS test-kustomize # renovate: datasource=github-releases packageName=kubernetes-sigs/kustomize RUN install-tool kustomize 5.4.2 @@ -87,7 +87,7 @@ RUN install-tool kustomize 5.4.2 #-------------------------------------- # Image: terraform #-------------------------------------- -FROM base as test-terraform +FROM base AS test-terraform # renovate: datasource=docker packageName=hashicorp/terraform versioning=docker RUN install-tool terraform 1.9.0 @@ -95,7 +95,7 @@ RUN install-tool terraform 1.9.0 #-------------------------------------- # Image: vendir #-------------------------------------- -FROM base as test-vendir +FROM base AS test-vendir # renovate: datasource=github-releases packageName=vmware-tanzu/carvel-vendir RUN install-tool vendir v0.40.2 diff --git a/test/nix/Dockerfile b/test/nix/Dockerfile index b06dca39e..260782ffd 100644 --- a/test/nix/Dockerfile +++ b/test/nix/Dockerfile @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN touch /.dummy @@ -26,7 +26,7 @@ WORKDIR /test #-------------------------------------- # test: nix 2.10 #-------------------------------------- -FROM base as testa +FROM base AS testa # old nix version, not for renovating RUN install-tool nix 2.10.0 @@ -53,7 +53,7 @@ RUN set -ex; \ #-------------------------------------- # test: nix latest #-------------------------------------- -FROM base as testb +FROM base AS testb USER 1000 diff --git a/test/nix/Dockerfile.arm64 b/test/nix/Dockerfile.arm64 index 004303849..792ff549c 100644 --- a/test/nix/Dockerfile.arm64 +++ b/test/nix/Dockerfile.arm64 @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN uname -p | tee | grep aarch64 RUN touch /.dummy @@ -23,7 +23,7 @@ RUN install-containerbase #-------------------------------------- # Image: nix #-------------------------------------- -FROM base as test-nix +FROM base AS test-nix # renovate: datasource=github-tags packageName=NixOS/nix RUN install-tool nix 2.23.1 diff --git a/test/node/Dockerfile b/test/node/Dockerfile index 592f915e8..f899a0876 100644 --- a/test/node/Dockerfile +++ b/test/node/Dockerfile @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN touch /.dummy @@ -26,7 +26,7 @@ WORKDIR /test #-------------------------------------- # build #-------------------------------------- -FROM base as build +FROM base AS build # renovate: datasource=node RUN install-tool node v20.15.0 @@ -37,7 +37,7 @@ USER 1000 #-------------------------------------- # test: node #-------------------------------------- -FROM build as testa +FROM build AS testa SHELL [ "/bin/sh", "-c" ] ENTRYPOINT [ ] @@ -64,7 +64,7 @@ RUN npm install -g re2@1.20.9 #-------------------------------------- # test: yarn #-------------------------------------- -FROM build as testb +FROM build AS testb ARG APT_HTTP_PROXY @@ -100,7 +100,7 @@ RUN install-tool yarn 4.3.1 # test: pnpm #-------------------------------------- -FROM build as testc +FROM build AS testc ARG APT_HTTP_PROXY @@ -123,7 +123,7 @@ RUN set -ex; \ # test: node 18 #-------------------------------------- -FROM base as testd +FROM base AS testd ARG APT_HTTP_PROXY @@ -159,7 +159,7 @@ RUN del -d test/a/** #-------------------------------------- # test: npm (install-tool npm) #-------------------------------------- -FROM build as teste +FROM build AS teste SHELL [ "/bin/sh", "-c" ] @@ -188,7 +188,7 @@ RUN npm --version | grep '7.24.2' #-------------------------------------- # test: use npm from node to install #-------------------------------------- -FROM build as testf +FROM build AS testf RUN install-tool node 10.24.0 # intentionally fails @@ -202,7 +202,7 @@ RUN yarn --version #-------------------------------------- # test: npm (npm install -g npm) #-------------------------------------- -FROM build as testg +FROM build AS testg SHELL [ "/bin/sh", "-c" ] @@ -229,7 +229,7 @@ RUN set -ex; cd a; npm install #-------------------------------------- # test: yarn-slim #-------------------------------------- -FROM build as testh +FROM build AS testh # renovate: datasource=npm packageName=yarn RUN install-tool yarn-slim 1.22.22 @@ -240,7 +240,7 @@ RUN set -ex; cd a; yarn install; [[ ! -d node_modules/.bin ]] || exit 1 #-------------------------------------- # test: npm (install-tool npm, node v14) #-------------------------------------- -FROM base as testi +FROM base AS testi ARG CONTAINERBASE_DEBUG @@ -269,7 +269,7 @@ RUN set -ex; cd a; npm install --ignore-scripts #-------------------------------------- # test: openshift yarn #-------------------------------------- -FROM build as testj +FROM build AS testj USER 1111:0 @@ -297,7 +297,7 @@ RUN install-tool yarn 1.22.15 #-------------------------------------- # test: openshift npm (install-tool npm) #-------------------------------------- -FROM build as testk +FROM build AS testk ARG CONTAINERBASE_DEBUG # ENV NPM_CONFIG_LOGLEVEL=verbose @@ -338,7 +338,7 @@ RUN set -ex; \ #-------------------------------------- # test: corepack #-------------------------------------- -FROM build as testl +FROM build AS testl SHELL [ "/bin/sh", "-c" ] RUN set -ex; \ @@ -369,7 +369,7 @@ RUN set -ex; \ #-------------------------------------- # test: yarn (corepack) #-------------------------------------- -FROM build as testm +FROM build AS testm SHELL [ "/bin/sh", "-c" ] @@ -387,7 +387,7 @@ RUN set -ex; cd a; \ #-------------------------------------- # test: yarn v3 (corepack) #-------------------------------------- -FROM build as testn +FROM build AS testn SHELL [ "/bin/sh", "-c" ] @@ -415,7 +415,7 @@ RUN set -ex; cd b; \ #-------------------------------------- # test: pnpm (corepack) #-------------------------------------- -FROM build as testo +FROM build AS testo SHELL [ "/bin/sh", "-c" ] @@ -440,7 +440,7 @@ RUN set -ex; cd a; \ #-------------------------------------- # test: pnpm / yarn (link / wrapper overrides) #-------------------------------------- -FROM build as testp +FROM build AS testp ARG PNPM_VERSION=6.0.0 ARG YARN_VERSION=1.22.0 @@ -476,7 +476,7 @@ RUN set -ex; \ #-------------------------------------- # test: renovate #-------------------------------------- -FROM base as testq +FROM base AS testq # install latest version RUN install-tool node diff --git a/test/node/Dockerfile.arm64 b/test/node/Dockerfile.arm64 index 008324dcd..cd8e7d024 100644 --- a/test/node/Dockerfile.arm64 +++ b/test/node/Dockerfile.arm64 @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN uname -p | tee | grep aarch64 RUN touch /.dummy @@ -23,7 +23,7 @@ RUN install-containerbase #-------------------------------------- # Image: node #-------------------------------------- -FROM base as test-node +FROM base AS test-node # renovate: datasource=node RUN install-tool node v20.15.0 @@ -32,7 +32,7 @@ RUN install-tool node v20.15.0 #-------------------------------------- # Image: pnpm #-------------------------------------- -FROM test-node as test-pnpm +FROM test-node AS test-pnpm # renovate: datasource=npm RUN install-tool pnpm 9.4.0 @@ -40,7 +40,7 @@ RUN install-tool pnpm 9.4.0 #-------------------------------------- # Image: yarn #-------------------------------------- -FROM test-node as test-yarn +FROM test-node AS test-yarn # renovate: datasource=npm RUN install-tool yarn 1.22.22 @@ -48,7 +48,7 @@ RUN install-tool yarn 1.22.22 #-------------------------------------- # Image: renovate #-------------------------------------- -FROM test-node as test-renovate +FROM test-node AS test-renovate # renovate: datasource=npm RUN install-tool renovate 37.421.3 diff --git a/test/php/Dockerfile b/test/php/Dockerfile index 45d291c46..0be959df7 100644 --- a/test/php/Dockerfile +++ b/test/php/Dockerfile @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN touch /.dummy @@ -25,7 +25,7 @@ WORKDIR /test #-------------------------------------- # test: php 7.4 #-------------------------------------- -FROM base as testa +FROM base AS testa # old php version, not for renovating RUN install-tool php 7.4.14 @@ -71,7 +71,7 @@ RUN set -ex; \ #-------------------------------------- # test: php 5.6 #-------------------------------------- -FROM base as testb +FROM base AS testb # old php version, not for renovating RUN install-tool php 5.6.40 @@ -102,7 +102,7 @@ RUN composer --version #-------------------------------------- # test: php 8.0 #-------------------------------------- -FROM base as testc +FROM base AS testc # no auto env for testing SHELL [ "/bin/sh", "-c" ] @@ -140,7 +140,7 @@ RUN composer --version #-------------------------------------- # testd: php 8.0 (non-root) #-------------------------------------- -FROM base as testd +FROM base AS testd # no auto env for testing SHELL [ "/bin/sh", "-c" ] diff --git a/test/php/Dockerfile.arm64 b/test/php/Dockerfile.arm64 index 7331eb70c..a1f2e00f5 100644 --- a/test/php/Dockerfile.arm64 +++ b/test/php/Dockerfile.arm64 @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN uname -p | tee | grep aarch64 RUN touch /.dummy @@ -23,14 +23,14 @@ RUN install-containerbase #-------------------------------------- # Image: php #-------------------------------------- -FROM base as test-php +FROM base AS test-php # renovate: datasource=github-releases packageName=containerbase/php-prebuild RUN install-tool php 8.3.8 #-------------------------------------- # Image: composer #-------------------------------------- -FROM test-php as test-composer +FROM test-php AS test-composer # renovate: datasource=github-releases packageName=composer/composer RUN install-tool composer 2.7.7 diff --git a/test/powershell/Dockerfile b/test/powershell/Dockerfile index 287e47679..359be08a0 100644 --- a/test/powershell/Dockerfile +++ b/test/powershell/Dockerfile @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN touch /.dummy @@ -22,7 +22,7 @@ RUN install-containerbase #-------------------------------------- # test: powershell 7.2 (non-root) #-------------------------------------- -FROM base as testa +FROM base AS testa RUN prepare-tool powershell @@ -44,7 +44,7 @@ RUN pwsh --version #-------------------------------------- # test: powershell 7.x #-------------------------------------- -FROM base as testb +FROM base AS testb # renovate: datasource=github-releases packageName=PowerShell/PowerShell RUN install-tool powershell v7.4.3 diff --git a/test/powershell/Dockerfile.arm64 b/test/powershell/Dockerfile.arm64 index 841856abc..20716d391 100644 --- a/test/powershell/Dockerfile.arm64 +++ b/test/powershell/Dockerfile.arm64 @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN uname -p | tee | grep aarch64 RUN touch /.dummy @@ -23,7 +23,7 @@ RUN install-containerbase #-------------------------------------- # Image: test #-------------------------------------- -FROM base as test-powershell +FROM base AS test-powershell # renovate: datasource=github-releases packageName=PowerShell/PowerShell RUN install-tool powershell v7.4.3 diff --git a/test/python/Dockerfile b/test/python/Dockerfile index d2b6d29b1..de6bf33a1 100644 --- a/test/python/Dockerfile +++ b/test/python/Dockerfile @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN touch /.dummy @@ -35,7 +35,7 @@ WORKDIR /test #-------------------------------------- # build #-------------------------------------- -FROM base as build +FROM base AS build # Python # renovate: datasource=github-releases packageName=containerbase/python-prebuild @@ -44,7 +44,7 @@ RUN install-tool python 3.12.4 #-------------------------------------- # build-rootless #-------------------------------------- -FROM base as build-rootless +FROM base AS build-rootless RUN prepare-tool python @@ -56,7 +56,7 @@ RUN install-tool python 3.12.4 #-------------------------------------- # build: pipenv #-------------------------------------- -FROM build as pipenv +FROM build AS pipenv # renovate: datasource=pypi RUN install-tool pipenv 2024.0.1 @@ -66,7 +66,7 @@ USER 1000 #-------------------------------------- # build: poetry #-------------------------------------- -FROM build as poetry +FROM build AS poetry # renovate: datasource=pypi RUN install-tool poetry 1.8.3 @@ -76,7 +76,7 @@ USER 1000 #-------------------------------------- # test pip-tools-a: pip-tools #-------------------------------------- -FROM build as test-pip-tools-a +FROM build AS test-pip-tools-a # renovate: datasource=pypi RUN install-tool pip-tools 7.4.1 @@ -84,7 +84,7 @@ RUN install-tool pip-tools 7.4.1 #-------------------------------------- # test pip-tools-b: pip-tools (older python) #-------------------------------------- -FROM base as test-pip-tools-b +FROM base AS test-pip-tools-b # python < 3.9 is not supported by the keyrings.envvars library that is installed along with pip-tools, # so make sure we can still install on an older version @@ -96,7 +96,7 @@ RUN install-tool pip-tools 7.4.1 #-------------------------------------- # test poetry-a: build #-------------------------------------- -FROM build as test-poetry-a +FROM build AS test-poetry-a # try install again, sould skip # renovate: datasource=github-releases packageName=containerbase/python-prebuild @@ -114,7 +114,7 @@ RUN poetry --version #-------------------------------------- # test pipenv-a: pipenv #-------------------------------------- -FROM pipenv as test-pipenv-a +FROM pipenv AS test-pipenv-a RUN set -ex; \ cd a; \ @@ -124,7 +124,7 @@ RUN set -ex; \ #-------------------------------------- # test poetry-b: c-poetry #-------------------------------------- -FROM poetry as test-poetry-b +FROM poetry AS test-poetry-b RUN set -ex; cd c-poetry && poetry update --lock --no-interaction @@ -134,7 +134,7 @@ RUN set -ex; cd c-poetry && poetry add h5py #-------------------------------------- # test poetry-c: d-poetry #-------------------------------------- -FROM poetry as test-poetry-c +FROM poetry AS test-poetry-c RUN set -ex; cd d-poetry && poetry update --lock --no-interaction pytest @@ -142,7 +142,7 @@ RUN set -ex; cd d-poetry && poetry update --lock --no-interaction pytest #-------------------------------------- # test poetry-d: poetry (old versions) #-------------------------------------- -FROM base as test-poetry-d +FROM base AS test-poetry-d # python 3.12+ not supported RUN install-tool python 3.11.6 @@ -153,7 +153,7 @@ RUN install-tool poetry 1.1.15 #-------------------------------------- # poetry test e: root install - non root install #-------------------------------------- -FROM build as test-poetry-e +FROM build AS test-poetry-e # renovate: datasource=pypi RUN install-tool poetry 1.8.3 @@ -169,7 +169,7 @@ RUN install-tool poetry 1.8.3 #-------------------------------------- # test a: pip_requirements #-------------------------------------- -FROM build as testa +FROM build AS testa # renovate: datasource=pypi RUN install-tool hashin 1.0.1 @@ -182,7 +182,7 @@ RUN set -ex; \ #-------------------------------------- # test b: non-root #-------------------------------------- -FROM build-rootless as testb +FROM build-rootless AS testb # renovate: datasource=pypi RUN install-tool pipenv 2024.0.1 @@ -220,7 +220,7 @@ RUN install-tool checkov 2.3.298 #-------------------------------------- # test pipenv-b: pipenv (multiple python) #-------------------------------------- -FROM build as test-pipenv-b +FROM build AS test-pipenv-b USER 1000 @@ -241,7 +241,7 @@ RUN set -ex; \ #-------------------------------------- # test pdm: pdm (multiple python) #-------------------------------------- -FROM build as test-pdm +FROM build AS test-pdm USER 1000 @@ -251,7 +251,7 @@ RUN install-tool pdm 2.16.1 #-------------------------------------- # test conan #-------------------------------------- -FROM build as test-conan +FROM build AS test-conan RUN prepare-tool conan @@ -269,7 +269,7 @@ RUN set -ex; \ #-------------------------------------- # test c: python2.7 #-------------------------------------- -FROM build-rootless as testc +FROM build-rootless AS testc # test older python install RUN install-tool python 3.6.15 diff --git a/test/python/Dockerfile.arm64 b/test/python/Dockerfile.arm64 index b0bb556d6..8090b0457 100644 --- a/test/python/Dockerfile.arm64 +++ b/test/python/Dockerfile.arm64 @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN uname -p | tee | grep aarch64 RUN touch /.dummy @@ -23,7 +23,7 @@ RUN install-containerbase #-------------------------------------- # Image: python #-------------------------------------- -FROM base as test-python +FROM base AS test-python # renovate: datasource=github-releases packageName=containerbase/python-prebuild RUN install-tool python 3.12.4 @@ -31,7 +31,7 @@ RUN install-tool python 3.12.4 #-------------------------------------- # Image: checkov #-------------------------------------- -FROM test-python as test-checkov +FROM test-python AS test-checkov # renovate: datasource=pypi RUN install-tool checkov 3.2.159 @@ -39,7 +39,7 @@ RUN install-tool checkov 3.2.159 #-------------------------------------- # Image: hashin #-------------------------------------- -FROM test-python as test-hashin +FROM test-python AS test-hashin # renovate: datasource=pypi RUN install-tool hashin 1.0.1 @@ -47,7 +47,7 @@ RUN install-tool hashin 1.0.1 #-------------------------------------- # Image: pipenv #-------------------------------------- -FROM test-python as test-pipenv +FROM test-python AS test-pipenv # renovate: datasource=pypi RUN install-tool pipenv 2024.0.1 @@ -55,7 +55,7 @@ RUN install-tool pipenv 2024.0.1 #-------------------------------------- # Image: poetry #-------------------------------------- -FROM test-python as test-poetry +FROM test-python AS test-poetry # renovate: datasource=pypi RUN install-tool poetry 1.8.3 @@ -63,7 +63,7 @@ RUN install-tool poetry 1.8.3 #-------------------------------------- # Image: conan #-------------------------------------- -FROM test-python as test-conan +FROM test-python AS test-conan # renovate: datasource=pypi RUN install-tool conan 2.4.1 diff --git a/test/ruby/Dockerfile b/test/ruby/Dockerfile index 6aa0a7822..c59d01831 100644 --- a/test/ruby/Dockerfile +++ b/test/ruby/Dockerfile @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN touch /.dummy @@ -29,7 +29,7 @@ WORKDIR /test #-------------------------------------- # build: ruby 3.x #-------------------------------------- -FROM base as build +FROM base AS build # renovate: datasource=github-releases packageName=containerbase/ruby-prebuild RUN install-tool ruby 3.3.3 @@ -37,7 +37,7 @@ RUN install-tool ruby 3.3.3 #-------------------------------------- # test: bundler (gem) #-------------------------------------- -FROM build as test-bundler-a +FROM build AS test-bundler-a ENV PATH=/home/ubuntu/bin:$PATH @@ -67,7 +67,7 @@ RUN set -ex; \ #-------------------------------------- # test: global bundler #-------------------------------------- -FROM build as test-bundler-b +FROM build AS test-bundler-b # renovate: datasource=rubygems depName=bundler RUN install-tool bundler 2.4.22 @@ -87,7 +87,7 @@ RUN ruby --version #-------------------------------------- # test: bundler (install-tool) #-------------------------------------- -FROM build as test-bundler-c +FROM build AS test-bundler-c USER 1000 @@ -111,7 +111,7 @@ RUN set -ex; \ #-------------------------------------- # test: bundler install root - install rootless #-------------------------------------- -FROM build as test-bundler-d +FROM build AS test-bundler-d # renovate: datasource=rubygems depName=bundler ENV BUNDLER_VERSION=2.5.14 @@ -132,7 +132,7 @@ RUN install-tool bundler #-------------------------------------- # test: cocoapods (install-tool) #-------------------------------------- -FROM build as test-cocoapods-a +FROM build AS test-cocoapods-a USER 1000 @@ -148,7 +148,7 @@ RUN set -ex; \ #-------------------------------------- # test: install-gem #-------------------------------------- -FROM build as test-gem +FROM build AS test-gem USER 1000 diff --git a/test/ruby/Dockerfile.arm64 b/test/ruby/Dockerfile.arm64 index 4f593dc45..a8d21e969 100644 --- a/test/ruby/Dockerfile.arm64 +++ b/test/ruby/Dockerfile.arm64 @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN uname -p | tee | grep aarch64 RUN touch /.dummy @@ -23,7 +23,7 @@ RUN install-containerbase #-------------------------------------- # Image: ruby #-------------------------------------- -FROM base as test-ruby +FROM base AS test-ruby # renovate: datasource=github-releases packageName=containerbase/ruby-prebuild versioning=ruby RUN install-tool ruby 3.3.3 @@ -31,7 +31,7 @@ RUN install-tool ruby 3.3.3 #-------------------------------------- # Image: bundler #-------------------------------------- -FROM test-ruby as test-bundler +FROM test-ruby AS test-bundler # renovate: datasource=rubygems versioning=ruby RUN install-tool bundler 2.5.14 @@ -39,7 +39,7 @@ RUN install-tool bundler 2.5.14 #-------------------------------------- # Image: cocoapods #-------------------------------------- -FROM test-ruby as test-cocoapods +FROM test-ruby AS test-cocoapods # cocoapods need git, but don't install yet # renovate: datasource=github-tags packageName=git/git diff --git a/test/rust/Dockerfile b/test/rust/Dockerfile index 7fab25f73..8ef03f00e 100644 --- a/test/rust/Dockerfile +++ b/test/rust/Dockerfile @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN touch /.dummy @@ -27,7 +27,7 @@ RUN prepare-tool rust #-------------------------------------- # build #-------------------------------------- -FROM base as build +FROM base AS build # renovate: datasource=docker versioning=docker RUN install-tool rust 1.79.0 @@ -41,7 +41,7 @@ USER 1000 #-------------------------------------- # test a: root #-------------------------------------- -FROM build as testa +FROM build AS testa RUN set -ex; \ cd a; \ @@ -55,7 +55,7 @@ RUN cargo --version #-------------------------------------- # test b: non-root #-------------------------------------- -FROM base as testb +FROM base AS testb USER 1000 diff --git a/test/rust/Dockerfile.arm64 b/test/rust/Dockerfile.arm64 index 01a4610a9..769c4fdb9 100644 --- a/test/rust/Dockerfile.arm64 +++ b/test/rust/Dockerfile.arm64 @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN uname -p | tee | grep aarch64 RUN touch /.dummy @@ -23,7 +23,7 @@ RUN install-containerbase #-------------------------------------- # Image: rust #-------------------------------------- -FROM base as test-rust +FROM base AS test-rust # renovate: datasource=docker versioning=docker RUN install-tool rust 1.79.0 diff --git a/test/swift/Dockerfile b/test/swift/Dockerfile index 9aa1f6aaf..812751364 100644 --- a/test/swift/Dockerfile +++ b/test/swift/Dockerfile @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN touch /.dummy @@ -25,7 +25,7 @@ WORKDIR /test #-------------------------------------- # build #-------------------------------------- -FROM base as build +FROM base AS build # TODO: move to prepare # renovate: datasource=github-tags packageName=git/git @@ -37,7 +37,7 @@ RUN install-tool swift 5.10.1 #-------------------------------------- # testa: swift latest #-------------------------------------- -FROM build as testa +FROM build AS testa USER 1000 @@ -62,7 +62,7 @@ RUN swift --version #-------------------------------------- # testb: swift 5.2.5 (non-root) #-------------------------------------- -FROM build as testb +FROM build AS testb USER 1000 diff --git a/test/swift/Dockerfile.arm64 b/test/swift/Dockerfile.arm64 index b553034fe..db51c5274 100644 --- a/test/swift/Dockerfile.arm64 +++ b/test/swift/Dockerfile.arm64 @@ -1,7 +1,7 @@ #-------------------------------------- # Image: base #-------------------------------------- -FROM ubuntu:focal as base +FROM ubuntu:focal AS base RUN uname -p | tee | grep aarch64 RUN touch /.dummy @@ -26,7 +26,7 @@ RUN install-containerbase #-------------------------------------- # Image: swift #-------------------------------------- -FROM base as test-swift +FROM base AS test-swift # renovate: datasource=docker versioning=docker RUN install-tool swift 5.10.1