public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "John Helmert III" <ajak@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/docker-images:master commit in: /
Date: Sun,  3 Mar 2024 04:31:08 +0000 (UTC)	[thread overview]
Message-ID: <1709439768.b34b40552fb2c632908967b55bc6972068565fd7.ajak@gentoo> (raw)

commit:     b34b40552fb2c632908967b55bc6972068565fd7
Author:     Rahil Bhimjiani <me <AT> rahil <DOT> rocks>
AuthorDate: Tue Feb 27 16:31:26 2024 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sun Mar  3 04:22:48 2024 +0000
URL:        https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=b34b4055

python.Dockerfile: use HEREDOC syntax for RUN command

HEREDOC syntax is supported in docker
https://docs.docker.com/reference/dockerfile/#here-documents

Why:
1) better readability
2) ability to add comments
3) can treat it like another bash script

Signed-off-by: Rahil Bhimjiani <me <AT> rahil.rocks>
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 python.Dockerfile | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/python.Dockerfile b/python.Dockerfile
index 7b61532..b0a5bd3 100644
--- a/python.Dockerfile
+++ b/python.Dockerfile
@@ -1,16 +1,31 @@
+# syntax=docker/dockerfile:1
+
+# FIRST LINE IS VERY IMPORTANT. DO NOT MODIFY
+
 FROM gentoo/stage3:amd64-nomultilib-openrc
 
 # derived from https://github.com/projg2/gentoo-python-image/blob/master/Dockerfile
 
-RUN echo '*/* ~amd64' >> /etc/portage/package.accept_keywords/base.conf \
- && echo '*/* full-stdlib sqlite' >> /etc/portage/package.use/python \
- && echo 'dev-vcs/git -perl' >> /etc/portage/package.use/git \
- && wget --progress=dot:mega -O - https://github.com/gentoo-mirror/gentoo/archive/master.tar.gz | tar -xz \
- && mv gentoo-master /var/db/repos/gentoo \
- && emerge -1vnt --jobs dev-python/tox app-arch/lzip dev-vcs/git \
-    dev-python/pypy{,3_9,3_10}-exe-bin dev-db/sqlite \
- && emerge -1v --jobs --nodeps dev-lang/python:{2.7,3.8,3.9,3.10,3.11,3.12} \
-    dev-python/pypy{,3_9,3_10,3} \
- && rm -r /var/db/repos/* /var/cache/distfiles/*
+RUN <<-EOF
+    set -e
+
+    # configure portage
+    echo '*/* ~amd64' >> /etc/portage/package.accept_keywords/base.conf
+    echo '*/* full-stdlib sqlite' >> /etc/portage/package.use/python
+    echo 'dev-vcs/git -perl' >> /etc/portage/package.use/git
+
+    # install ::gentoo
+    wget --progress=dot:mega -O - https://github.com/gentoo-mirror/gentoo/archive/master.tar.gz | tar -xz
+    mv gentoo-master /var/db/repos/gentoo
+
+    # main job
+    emerge -1vnt --jobs dev-python/tox app-arch/lzip dev-vcs/git \
+        dev-python/pypy{,3_9,3_10}-exe-bin dev-db/sqlite
+    emerge -1v --jobs --nodeps dev-lang/python:{2.7,3.8,3.9,3.10,3.11,3.12} \
+        dev-python/pypy{,3_9,3_10,3}
+
+    # cleanup
+    rm -r /var/db/repos/* /var/cache/distfiles/*
+EOF
 
 CMD ["/bin/bash"]


             reply	other threads:[~2024-03-03  4:31 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-03  4:31 John Helmert III [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-04-29  8:57 [gentoo-commits] proj/docker-images:master commit in: / Alexys Jacob
2024-11-27 12:39 Michał Górny
2024-11-23  7:25 Michał Górny
2024-11-23  7:20 Michał Górny
2024-11-23  7:20 Michał Górny
2024-11-23  7:20 Michał Górny
2024-11-23  7:13 Michał Górny
2024-09-14 21:07 John Helmert III
2024-09-08 22:47 John Helmert III
2024-05-26 16:39 John Helmert III
2024-05-26 14:27 John Helmert III
2024-05-26 14:27 John Helmert III
2024-03-03  4:31 John Helmert III
2024-03-03  4:31 John Helmert III
2024-02-18 17:12 John Helmert III
2024-02-08  3:17 John Helmert III
2024-02-08  3:17 John Helmert III
2024-02-08  3:17 John Helmert III
2024-02-08  3:17 John Helmert III
2023-11-26 20:54 John Helmert III
2023-10-14 17:35 John Helmert III
2022-12-21 19:56 John Helmert III
2022-05-23  8:24 Alexys Jacob
2022-02-18 17:39 Alexys Jacob
2021-10-21 11:13 Alexys Jacob
2021-08-30  7:34 Alexys Jacob
2021-04-30  7:58 Alexys Jacob
2021-02-13 17:51 Alexys Jacob
2021-02-13 17:51 Alexys Jacob
2021-02-13 17:51 Alexys Jacob
2021-02-05 21:55 Max Magorsch
2020-09-04 14:49 Alexys Jacob
2020-09-04 14:49 Alexys Jacob
2020-09-03 20:34 Alexys Jacob
2020-08-26  9:03 Alexys Jacob
2020-08-24 13:05 Alexys Jacob
2020-08-24 12:58 Alexys Jacob
2020-08-20 12:17 Alexys Jacob
2020-08-20  9:28 Alexys Jacob
2020-05-26 11:54 Alexys Jacob
2020-04-09  7:26 Alexys Jacob
2020-04-09  7:26 Alexys Jacob
2020-02-23 19:48 Alexys Jacob
2020-02-23 19:46 Alexys Jacob
2020-02-23 19:46 Alexys Jacob
2019-11-15  8:28 Alexys Jacob
2019-11-15  8:28 Alexys Jacob
2019-11-15  8:28 Alexys Jacob
2019-11-15  8:25 Alexys Jacob
2019-11-14 23:02 Alexys Jacob

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1709439768.b34b40552fb2c632908967b55bc6972068565fd7.ajak@gentoo \
    --to=ajak@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox