From b8c7ee3a85bf19cc1bb04b013f0447cff85eddd7 Mon Sep 17 00:00:00 2001 From: Johannes Altmanninger Date: Sat, 1 Nov 2025 13:07:01 +0100 Subject: [PATCH] Fix Dockerfile syntax Enigmatic error: 1 | >>> FROM alpine:3.22 # updatecli.d/docker.yml ERROR: failed to build: failed to solve: dockerfile parse error on line 1: FROM requires either one or three arguments Fixes daadd81ab6e (More automation for updating dependencies, 2025-10-31). --- docker/alpine.Dockerfile | 3 ++- docker/ubuntu-latest-lts.Dockerfile | 3 ++- docker/ubuntu-oldest-supported.Dockerfile | 3 ++- updatecli.d/docker.yml | 6 +++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/docker/alpine.Dockerfile b/docker/alpine.Dockerfile index 888f4928d..60007ffb5 100644 --- a/docker/alpine.Dockerfile +++ b/docker/alpine.Dockerfile @@ -1,4 +1,5 @@ -FROM alpine:3.22 # updatecli.d/docker.yml +# Version set by updatecli.d/docker.yml +FROM alpine:3.22 LABEL org.opencontainers.image.source=https://github.com/fish-shell/fish-shell ENV LANG=C.UTF-8 diff --git a/docker/ubuntu-latest-lts.Dockerfile b/docker/ubuntu-latest-lts.Dockerfile index 5de4e0c67..72cdbc3a4 100644 --- a/docker/ubuntu-latest-lts.Dockerfile +++ b/docker/ubuntu-latest-lts.Dockerfile @@ -1,4 +1,5 @@ -FROM ubuntu:24.04 # updatecli.d/docker.yml +# Version set by updatecli.d/docker.yml +FROM ubuntu:24.04 LABEL org.opencontainers.image.source=https://github.com/fish-shell/fish-shell ENV LANG=C.UTF-8 diff --git a/docker/ubuntu-oldest-supported.Dockerfile b/docker/ubuntu-oldest-supported.Dockerfile index 5c40d80f7..8b4f0e6e7 100644 --- a/docker/ubuntu-oldest-supported.Dockerfile +++ b/docker/ubuntu-oldest-supported.Dockerfile @@ -1,4 +1,5 @@ -FROM ubuntu:22.04 # updatecli.d/docker.yml +# Version set by updatecli.d/docker.yml +FROM ubuntu:22.04 LABEL org.opencontainers.image.source=https://github.com/fish-shell/fish-shell ENV LANG=C.UTF-8 diff --git a/updatecli.d/docker.yml b/updatecli.d/docker.yml index 02682649d..06e5406bc 100644 --- a/updatecli.d/docker.yml +++ b/updatecli.d/docker.yml @@ -46,7 +46,7 @@ targets: spec: file: docker/alpine.Dockerfile matchpattern: "FROM alpine:.*" - replacepattern: 'FROM alpine:{{ source "alpine_latest_version" }} # updatecli.d/docker.yml' + replacepattern: 'FROM alpine:{{ source "alpine_latest_version" }}' ubuntu_latest_version_dockerfile: name: "Update oldest non-EOL Ubuntu Linux version" sourceid: ubuntu_latest_lts_version @@ -54,7 +54,7 @@ targets: spec: file: docker/ubuntu-latest-lts.Dockerfile matchpattern: "FROM ubuntu:.*" - replacepattern: 'FROM ubuntu:{{ source "ubuntu_latest_lts_version" }} # updatecli.d/docker.yml' + replacepattern: 'FROM ubuntu:{{ source "ubuntu_latest_lts_version" }}' ubuntu_oldest_supported_dockerfile: name: "Update oldest non-EOL Ubuntu Linux version" sourceid: ubuntu_oldest_non_eol_version @@ -62,4 +62,4 @@ targets: spec: file: docker/ubuntu-oldest-supported.Dockerfile matchpattern: "FROM ubuntu:.*" - replacepattern: 'FROM ubuntu:{{ source "ubuntu_oldest_non_eol_version" }} # updatecli.d/docker.yml' + replacepattern: 'FROM ubuntu:{{ source "ubuntu_oldest_non_eol_version" }}'