From 21c5e0e91c88fe2076054c01a359472de405e534 Mon Sep 17 00:00:00 2001
From: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date: Sat, 27 Jun 2020 21:20:34 +0900
Subject: [PATCH] Remove devuan/helper variant

The d1h package has been removed from the repository.

See:
- https://lists.dyne.org/lurker/message/20200620.113948.557bdda5.en.html
- https://gitlab.com/paddy-hack/devuan/-/pipelines/160703130
---
 README.md |  2 --
 derive.sh | 18 +-----------------
 helper.df | 16 ----------------
 3 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 helper.df

diff --git a/README.md b/README.md
index 7ae4e83..300421c 100644
--- a/README.md
+++ b/README.md
@@ -35,8 +35,6 @@ The [registry][2] contains the following image variants:
 - *devuan/builder* derives from the *devuan/slim* image and adds the
   "standard" packages needed to build binary packages.  It achieves
   this by installing `build-essential`.
-- *devuan/helper* extends *devuan/builder* by adding the `d1h` package
-  to the mix.
 
 There is also a *devuan/migrated* image, used during the build of the
 above for now (see #5 and [below](#how-did-i-get-there)), but that is
diff --git a/derive.sh b/derive.sh
index d95113c..9e7dd17 100755
--- a/derive.sh
+++ b/derive.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -eu
 # derive.sh -- handy Devuan images
-# Copyright (C) 2017  Olaf Meeuwissen
+# Copyright (C) 2017, 2020  Olaf Meeuwissen
 #
 # License: GPL-3.0+
 
@@ -22,19 +22,3 @@ if test $SUITE = $DEVUAN_RELEASE; then
     docker tag  $IMAGE:$SUITE $IMAGE
     docker push $IMAGE
 fi
-
-BASE_IMAGE=$IMAGE
-IMAGE=$CI_REGISTRY_IMAGE/helper
-
-docker build \
-       --build-arg DEVUAN_IMAGE=$BASE_IMAGE \
-       --tag $IMAGE:$SUITE-$STAMP \
-       --file $(basename $IMAGE).df .
-
-docker push $IMAGE:$SUITE-$STAMP
-docker tag  $IMAGE:$SUITE-$STAMP $IMAGE:$SUITE
-docker push $IMAGE:$SUITE
-if test $SUITE = $DEVUAN_RELEASE; then
-    docker tag  $IMAGE:$SUITE $IMAGE
-    docker push $IMAGE
-fi
diff --git a/helper.df b/helper.df
deleted file mode 100644
index 36b5c39..0000000
--- a/helper.df
+++ /dev/null
@@ -1,16 +0,0 @@
-# helper.df -- a Devuan image with d1h to speed up package maintenance
-# Copyright (C) 2017  Olaf Meeuwissen
-#
-# License: GPL-3.0+
-
-ARG   DEVUAN_IMAGE
-FROM  ${DEVUAN_IMAGE}
-LABEL maintainer="Olaf Meeuwissen <paddy-hack@member.fsf.org>"
-
-RUN echo "deb http://packages.devuan.org/devuan/ experimental main" \
-         > /etc/apt/sources.list.d/experimental.list \
-    && apt-get update -q \
-    && DEBIAN_FRONTEND=noninteractive \
-       apt-get install -q -y \
-               -t experimental d1h \
-    && remove-apt-lists