Skip to content

Commit

Permalink
test: fix dockerfile casing
Browse files Browse the repository at this point in the history
  • Loading branch information
viceice committed Jul 3, 2024
1 parent f6555bb commit 6b72750
Show file tree
Hide file tree
Showing 38 changed files with 198 additions and 198 deletions.
18 changes: 9 additions & 9 deletions test/Dockerfile.jammy
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#--------------------------------------
# Image: base
#--------------------------------------
FROM ubuntu:jammy as base
FROM ubuntu:jammy AS base

ARG APT_HTTP_PROXY
ARG CONTAINERBASE_DEBUG
Expand All @@ -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

Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
18 changes: 9 additions & 9 deletions test/Dockerfile.noble
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#--------------------------------------
# Image: base
#--------------------------------------
FROM ubuntu:noble as base
FROM ubuntu:noble AS base

ARG APT_HTTP_PROXY
ARG CONTAINERBASE_DEBUG
Expand All @@ -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

Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions test/dart/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#--------------------------------------
# Image: base
#--------------------------------------
FROM ubuntu:focal as base
FROM ubuntu:focal AS base

RUN touch /.dummy

Expand All @@ -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

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/dart/Dockerfile.arm64
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
12 changes: 6 additions & 6 deletions test/dotnet/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#--------------------------------------
# Image: base
#--------------------------------------
FROM ubuntu:focal as base
FROM ubuntu:focal AS base

RUN touch /.dummy

Expand All @@ -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.
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/dotnet/Dockerfile.arm64
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions test/erlang/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#--------------------------------------
# Image: base
#--------------------------------------
FROM ubuntu:focal as base
FROM ubuntu:focal AS base

RUN touch /.dummy

Expand All @@ -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
Expand All @@ -53,7 +53,7 @@ RUN set -ex; \
#--------------------------------------
# test: erlang (v24,user,openshift)
#--------------------------------------
FROM build as testb
FROM build AS testb

USER 1001

Expand All @@ -74,7 +74,7 @@ RUN set -ex; \
#--------------------------------------
# test: erlang (v22,user,openshift)
#--------------------------------------
FROM build as testc
FROM build AS testc

USER 1001

Expand Down
6 changes: 3 additions & 3 deletions test/erlang/Dockerfile.arm64
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -23,15 +23,15 @@ 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

#--------------------------------------
# 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
Expand Down
Loading

0 comments on commit 6b72750

Please sign in to comment.