From 8b60feed922cc91d8f2ab97116e0e69074d0e48b Mon Sep 17 00:00:00 2001 From: Luke Parker Date: Sat, 9 Aug 2025 12:20:58 -0400 Subject: [PATCH] Normalize FROM AS casing in Dockerfiles --- orchestration/src/main.rs | 6 +++--- orchestration/src/mimalloc.rs | 4 ++-- orchestration/src/networks/bitcoin.rs | 2 +- orchestration/src/networks/ethereum/consensus/lighthouse.rs | 2 +- orchestration/src/networks/ethereum/consensus/nimbus.rs | 2 +- orchestration/src/networks/ethereum/execution/reth.rs | 2 +- orchestration/src/networks/monero.rs | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/orchestration/src/main.rs b/orchestration/src/main.rs index f703a300..1bad77fb 100644 --- a/orchestration/src/main.rs +++ b/orchestration/src/main.rs @@ -92,7 +92,7 @@ fn os(os: Os, additional_root: &str, user: &str) -> String { match os { Os::Alpine => format!( r#" -FROM alpine:latest as image +FROM alpine:latest AS image COPY --from=mimalloc-alpine libmimalloc.so /usr/lib ENV LD_PRELOAD=libmimalloc.so @@ -117,7 +117,7 @@ WORKDIR /home/{user} Os::Debian => format!( r#" -FROM debian:bookworm-slim as image +FROM debian:bookworm-slim AS image COPY --from=mimalloc-debian libmimalloc.so /usr/lib RUN echo "/usr/lib/libmimalloc.so" >> /etc/ld.so.preload @@ -146,7 +146,7 @@ fn build_serai_service(prelude: &str, release: bool, features: &str, package: &s format!( r#" -FROM rust:1.89-slim-bookworm as builder +FROM rust:1.89-slim-bookworm AS builder COPY --from=mimalloc-debian libmimalloc.so /usr/lib RUN echo "/usr/lib/libmimalloc.so" >> /etc/ld.so.preload diff --git a/orchestration/src/mimalloc.rs b/orchestration/src/mimalloc.rs index cb400ca6..51f5bfe7 100644 --- a/orchestration/src/mimalloc.rs +++ b/orchestration/src/mimalloc.rs @@ -2,7 +2,7 @@ use crate::Os; pub fn mimalloc(os: Os) -> &'static str { const ALPINE_MIMALLOC: &str = r#" -FROM alpine:latest as mimalloc-alpine +FROM alpine:latest AS mimalloc-alpine RUN apk update && apk upgrade && apk --no-cache add gcc g++ libc-dev make cmake git RUN git clone https://github.com/microsoft/mimalloc && \ @@ -16,7 +16,7 @@ RUN git clone https://github.com/microsoft/mimalloc && \ "#; const DEBIAN_MIMALLOC: &str = r#" -FROM debian:bookworm-slim as mimalloc-debian +FROM debian:bookworm-slim AS mimalloc-debian RUN apt update && apt upgrade -y && apt install -y gcc g++ make cmake git RUN git clone https://github.com/microsoft/mimalloc && \ diff --git a/orchestration/src/networks/bitcoin.rs b/orchestration/src/networks/bitcoin.rs index 128858ac..df97d7f5 100644 --- a/orchestration/src/networks/bitcoin.rs +++ b/orchestration/src/networks/bitcoin.rs @@ -5,7 +5,7 @@ use crate::{Network, Os, mimalloc, os, write_dockerfile}; pub fn bitcoin(orchestration_path: &Path, network: Network) { #[rustfmt::skip] const DOWNLOAD_BITCOIN: &str = r#" -FROM alpine:latest as bitcoin +FROM alpine:latest AS bitcoin ENV BITCOIN_VERSION=27.1 diff --git a/orchestration/src/networks/ethereum/consensus/lighthouse.rs b/orchestration/src/networks/ethereum/consensus/lighthouse.rs index 3434117d..00df59ea 100644 --- a/orchestration/src/networks/ethereum/consensus/lighthouse.rs +++ b/orchestration/src/networks/ethereum/consensus/lighthouse.rs @@ -5,7 +5,7 @@ pub fn lighthouse(network: Network) -> (String, String, String) { #[rustfmt::skip] const DOWNLOAD_LIGHTHOUSE: &str = r#" -FROM alpine:latest as lighthouse +FROM alpine:latest AS lighthouse ENV LIGHTHOUSE_VERSION=5.1.3 diff --git a/orchestration/src/networks/ethereum/consensus/nimbus.rs b/orchestration/src/networks/ethereum/consensus/nimbus.rs index 94649e4f..325263c2 100644 --- a/orchestration/src/networks/ethereum/consensus/nimbus.rs +++ b/orchestration/src/networks/ethereum/consensus/nimbus.rs @@ -20,7 +20,7 @@ pub fn nimbus(network: Network) -> (String, String, String) { #[rustfmt::skip] let download_nimbus = format!(r#" -FROM alpine:latest as nimbus +FROM alpine:latest AS nimbus ENV NIMBUS_VERSION=24.3.0 ENV NIMBUS_COMMIT=dc19b082 diff --git a/orchestration/src/networks/ethereum/execution/reth.rs b/orchestration/src/networks/ethereum/execution/reth.rs index 65b096dd..aeef39d5 100644 --- a/orchestration/src/networks/ethereum/execution/reth.rs +++ b/orchestration/src/networks/ethereum/execution/reth.rs @@ -5,7 +5,7 @@ pub fn reth(network: Network) -> (String, String, String) { #[rustfmt::skip] const DOWNLOAD_RETH: &str = r#" -FROM alpine:latest as reth +FROM alpine:latest AS reth ENV RETH_VERSION=0.2.0-beta.6 diff --git a/orchestration/src/networks/monero.rs b/orchestration/src/networks/monero.rs index 50a8bec9..9b8f24da 100644 --- a/orchestration/src/networks/monero.rs +++ b/orchestration/src/networks/monero.rs @@ -22,7 +22,7 @@ fn monero_internal( #[rustfmt::skip] let download_monero = format!(r#" -FROM alpine:latest as monero +FROM alpine:latest AS monero RUN apk --no-cache add gnupg