From d3203ec69847133bda87d7d9965b3c353d27eb79 Mon Sep 17 00:00:00 2001 From: Devansh-567 Date: Sun, 24 May 2026 18:07:51 +0530 Subject: [PATCH 1/2] fix: correct RUN command chaining in Dockerfiles Signed-off-by: Devansh-567 --- tools/Dockerfile.asciidoc_v1 | 30 ++++++++++++------------------ tools/Dockerfile.asciidoc_v2 | 24 ++++++++++-------------- 2 files changed, 22 insertions(+), 32 deletions(-) diff --git a/tools/Dockerfile.asciidoc_v1 b/tools/Dockerfile.asciidoc_v1 index 7613599e22..5515cfc95f 100644 --- a/tools/Dockerfile.asciidoc_v1 +++ b/tools/Dockerfile.asciidoc_v1 @@ -1,33 +1,27 @@ # SPDX-FileCopyrightText: 2024 The P4 Language Consortium # # SPDX-License-Identifier: Apache-2.0 - FROM ubuntu:22.04 LABEL maintainer="Language Design Working Group " LABEL description="Dockerfile used for building the asciidoc specification" - RUN apt-get update && \ apt-get install -y gnupg2 curl git rubygems ruby-dev cmake flex libglib2.0-dev libcairo2-dev libpango1.0-dev libxml2-dev libwebp-dev libzstd-dev libgdk-pixbuf-2.0-dev - RUN gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB &&\ - curl -sSL https://get.rvm.io | bash - + curl -sSL https://get.rvm.io | bash SHELL ["/bin/bash", "-c"] -RUN source /usr/local/rvm/scripts/rvm &&\ +RUN source /usr/local/rvm/scripts/rvm &&\ rvm install ruby-3.3.3 &&\ - rvm use 3.3.3 - + rvm use 3.3.3 SHELL ["/bin/sh", "-c"] RUN gem install asciidoctor &&\ - gem install asciidoctor-pdf \ - gem install asciidoctor-mathematical \ - gem install asciidoctor-bibtex\ - gem install asciidoctor-lists\ + gem install asciidoctor-pdf &&\ + gem install asciidoctor-mathematical &&\ + gem install asciidoctor-bibtex &&\ + gem install asciidoctor-lists &&\ git clone https://github.com/rouge-ruby/rouge &&\ - cd rouge \ - git log -n 1 | cat \ - gem build rouge.gemspec \ - gem install rouge-4.4.0.gem - + cd rouge &&\ + git log -n 1 | cat &&\ + gem build rouge.gemspec &&\ + gem install rouge-*.gem VOLUME ["/usr/src/p4-spec"] -WORKDIR /usr/src/p4-spec \ No newline at end of file +WORKDIR /usr/src/p4-spec diff --git a/tools/Dockerfile.asciidoc_v2 b/tools/Dockerfile.asciidoc_v2 index 607b218c79..c32144b125 100644 --- a/tools/Dockerfile.asciidoc_v2 +++ b/tools/Dockerfile.asciidoc_v2 @@ -1,24 +1,20 @@ # SPDX-FileCopyrightText: 2024 The P4 Language Consortium # # SPDX-License-Identifier: Apache-2.0 - FROM ruby:3.3.5 LABEL maintainer="Language Design Working Group " LABEL description="Dockerfile used for building the asciidoc specification" - RUN apt-get update && \ apt-get install -y cmake flex bison libglib2.0-dev libcairo2-dev libpango1.0-dev libxml2-dev libwebp-dev libzstd-dev libgdk-pixbuf-2.0-dev - -RUN gem install asciidoctor \ - gem install asciidoctor-pdf \ - gem install asciidoctor-mathematical \ - gem install asciidoctor-bibtex\ - gem install asciidoctor-lists\ +RUN gem install asciidoctor &&\ + gem install asciidoctor-pdf &&\ + gem install asciidoctor-mathematical &&\ + gem install asciidoctor-bibtex &&\ + gem install asciidoctor-lists &&\ git clone https://github.com/rouge-ruby/rouge &&\ - cd rouge \ - git log -n 1 | cat \ - gem build rouge.gemspec \ - gem install rouge-4.4.0.gem - + cd rouge &&\ + git log -n 1 | cat &&\ + gem build rouge.gemspec &&\ + gem install rouge-*.gem VOLUME ["/usr/src/p4-spec"] -WORKDIR /usr/src/p4-spec \ No newline at end of file +WORKDIR /usr/src/p4-spec From fed8d96859af107434d5e419ef2a8eea623d12bb Mon Sep 17 00:00:00 2001 From: Devansh-567 Date: Wed, 27 May 2026 10:08:18 +0530 Subject: [PATCH 2/2] remove: delete unused Dockerfile.asciidoc_v1 and Dockerfile.asciidoc_v2 Signed-off-by: Devansh-567 --- tools/Dockerfile.asciidoc_v1 | 27 --------------------------- tools/Dockerfile.asciidoc_v2 | 20 -------------------- 2 files changed, 47 deletions(-) delete mode 100644 tools/Dockerfile.asciidoc_v1 delete mode 100644 tools/Dockerfile.asciidoc_v2 diff --git a/tools/Dockerfile.asciidoc_v1 b/tools/Dockerfile.asciidoc_v1 deleted file mode 100644 index 5515cfc95f..0000000000 --- a/tools/Dockerfile.asciidoc_v1 +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-FileCopyrightText: 2024 The P4 Language Consortium -# -# SPDX-License-Identifier: Apache-2.0 -FROM ubuntu:22.04 -LABEL maintainer="Language Design Working Group " -LABEL description="Dockerfile used for building the asciidoc specification" -RUN apt-get update && \ - apt-get install -y gnupg2 curl git rubygems ruby-dev cmake flex libglib2.0-dev libcairo2-dev libpango1.0-dev libxml2-dev libwebp-dev libzstd-dev libgdk-pixbuf-2.0-dev -RUN gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB &&\ - curl -sSL https://get.rvm.io | bash -SHELL ["/bin/bash", "-c"] -RUN source /usr/local/rvm/scripts/rvm &&\ - rvm install ruby-3.3.3 &&\ - rvm use 3.3.3 -SHELL ["/bin/sh", "-c"] -RUN gem install asciidoctor &&\ - gem install asciidoctor-pdf &&\ - gem install asciidoctor-mathematical &&\ - gem install asciidoctor-bibtex &&\ - gem install asciidoctor-lists &&\ - git clone https://github.com/rouge-ruby/rouge &&\ - cd rouge &&\ - git log -n 1 | cat &&\ - gem build rouge.gemspec &&\ - gem install rouge-*.gem -VOLUME ["/usr/src/p4-spec"] -WORKDIR /usr/src/p4-spec diff --git a/tools/Dockerfile.asciidoc_v2 b/tools/Dockerfile.asciidoc_v2 deleted file mode 100644 index c32144b125..0000000000 --- a/tools/Dockerfile.asciidoc_v2 +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-FileCopyrightText: 2024 The P4 Language Consortium -# -# SPDX-License-Identifier: Apache-2.0 -FROM ruby:3.3.5 -LABEL maintainer="Language Design Working Group " -LABEL description="Dockerfile used for building the asciidoc specification" -RUN apt-get update && \ - apt-get install -y cmake flex bison libglib2.0-dev libcairo2-dev libpango1.0-dev libxml2-dev libwebp-dev libzstd-dev libgdk-pixbuf-2.0-dev -RUN gem install asciidoctor &&\ - gem install asciidoctor-pdf &&\ - gem install asciidoctor-mathematical &&\ - gem install asciidoctor-bibtex &&\ - gem install asciidoctor-lists &&\ - git clone https://github.com/rouge-ruby/rouge &&\ - cd rouge &&\ - git log -n 1 | cat &&\ - gem build rouge.gemspec &&\ - gem install rouge-*.gem -VOLUME ["/usr/src/p4-spec"] -WORKDIR /usr/src/p4-spec