Use release code names thoughout and exclusively. Fixes #8

.gitlab-ci.yml

@@ -5,6 +5,7 @@
 
 variables:
   DEBIAN_VERSION: jessie-20171009
+  DEVUAN_RELEASE: jessie
   TZ: UTC
   LC_ALL: C
 
@@ -28,9 +29,9 @@ migrate:
 build:
   stage: build
   script:
-    - ./build.sh stable
+    - ./build.sh jessie
 
 derive:
   stage: derive
   script:
-    - ./derive.sh stable
+    - ./derive.sh jessie

README.md

@@ -6,7 +6,7 @@ Devuan Docker Base Images
 For reasons outlined in my [Sandwiching Docker Between Devuan][1] blog
 post (in the bottom part), I decided to roll my own Devuan base images.
 
-You can pull the latest Devuan ``stable`` image with
+You can pull the latest base image for the current Devuan release with
 
 ``` sh
 docker pull registry.gitlab.com/paddy-hack/devuan

bootstrap.sh

@@ -10,11 +10,6 @@ export DEBIAN_FRONTEND
 apt-get update
 apt-get install debootstrap -q -y
 
-# See http://bugs.devuan.org/cgi/bugreport.cgi?bug=115
-for suite in stable testing unstable; do
-    ln -fs ceres /usr/share/debootstrap/scripts/$suite
-done
-
 suite=$1
 rootfs=$2
 

build.sh

@@ -28,14 +28,10 @@ EOF
 
 docker build -t $IMAGE:$STAMP .
 
-ALIAS=$(docker run --rm $IMAGE:$STAMP cat /etc/devuan_version)
-
 docker push $IMAGE:$STAMP
-docker tag  $IMAGE:$STAMP $IMAGE:$ALIAS
-docker push $IMAGE:$ALIAS
-docker tag  $IMAGE:$ALIAS $IMAGE:$SUITE
+docker tag  $IMAGE:$STAMP $IMAGE:$SUITE
 docker push $IMAGE:$SUITE
-if test $SUITE = stable; then
+if test $SUITE = $DEVUAN_RELEASE; then
     docker tag  $IMAGE:$SUITE $IMAGE
     docker push $IMAGE
 fi
@@ -57,14 +53,10 @@ EOF
 
 docker build -t $IMAGE:$STAMP .
 
-ALIAS=$(docker run --rm $IMAGE:$STAMP cat /etc/devuan_version)
-
 docker push $IMAGE:$STAMP
-docker tag  $IMAGE:$STAMP $IMAGE:$ALIAS
-docker push $IMAGE:$ALIAS
-docker tag  $IMAGE:$ALIAS $IMAGE:$SUITE
+docker tag  $IMAGE:$STAMP $IMAGE:$SUITE
 docker push $IMAGE:$SUITE
-if test $SUITE = stable; then
+if test $SUITE = $DEVUAN_RELEASE; then
     docker tag  $IMAGE:$SUITE $IMAGE
     docker push $IMAGE
 fi

derive.sh

@@ -15,14 +15,10 @@ docker build \
        --tag $IMAGE:$STAMP \
        --file $(basename $IMAGE).df .
 
-ALIAS=$(docker run --rm $IMAGE:$STAMP cat /etc/devuan_version)
-
 docker push $IMAGE:$STAMP
-docker tag  $IMAGE:$STAMP $IMAGE:$ALIAS
-docker push $IMAGE:$ALIAS
-docker tag  $IMAGE:$ALIAS $IMAGE:$SUITE
+docker tag  $IMAGE:$STAMP $IMAGE:$SUITE
 docker push $IMAGE:$SUITE
-if test $SUITE = stable; then
+if test $SUITE = $DEVUAN_RELEASE; then
     docker tag  $IMAGE:$SUITE $IMAGE
     docker push $IMAGE
 fi
@@ -36,11 +32,9 @@ docker build \
        --file $(basename $IMAGE).df .
 
 docker push $IMAGE:$STAMP
-docker tag  $IMAGE:$STAMP $IMAGE:$ALIAS
-docker push $IMAGE:$ALIAS
-docker tag  $IMAGE:$ALIAS $IMAGE:$SUITE
+docker tag  $IMAGE:$STAMP $IMAGE:$SUITE
 docker push $IMAGE:$SUITE
-if test $SUITE = stable; then
+if test $SUITE = $DEVUAN_RELEASE; then
     docker tag  $IMAGE:$SUITE $IMAGE
     docker push $IMAGE
 fi

scripts/tweak-apt-sources

@@ -1,22 +0,0 @@
-#!/bin/sh -eu
-# tweak-apt-sources -- to use alias instead of suite name
-# Copyright (C) 2017  Olaf Meeuwissen
-#
-# License: GPL-3.0+
-
-DIR=/
-ETC=etc/apt
-SOURCES=sources.list
-
-eval $(apt-config shell DIR Dir)
-eval $(apt-config shell ETC Dir::Etc)
-eval $(apt-config shell SOURCES Dir::Etc::sourcelist)
-
-cfg=$DIR$ETC$SOURCES
-
-suite=$1
-alias=$(cat /etc/devuan_version)
-
-sed -i "s/$suite/$alias/" $cfg
-
-rm $0