remove old docker packaging files, these have been replaced by
authorMicah Anderson <micah@riseup.net>
Tue, 25 Apr 2017 16:30:37 +0000 (12:30 -0400)
committerMicah Anderson <micah@riseup.net>
Tue, 25 Apr 2017 16:30:37 +0000 (12:30 -0400)
https://0xacab.org/leap/gitlab-buildpackage

15 files changed:
docker/packaging/B09lintian [deleted file]
docker/packaging/D10aptupdate [deleted file]
docker/packaging/D11unsafeio [deleted file]
docker/packaging/D12aptupgrade [deleted file]
docker/packaging/Dockerfile [deleted file]
docker/packaging/dput.cf [deleted file]
docker/packaging/mini-dinstall.conf [deleted file]
docker/packaging/pbuilderrc [deleted file]
docker/stretch_amd64/Dockerfile [deleted file]
docker/xenial_amd64/Dockerfile [deleted file]
docker/xenial_amd64/files/etc/apt/preferences.d/yakkety [deleted file]
docker/xenial_amd64/files/etc/apt/sources.list [deleted file]
docker/xenial_amd64/files/etc/apt/sources.list.d/yakkety.list [deleted file]
docker/yakkety_amd64/Dockerfile [deleted file]
docker/yakkety_amd64/files/etc/apt/sources.list [deleted file]

diff --git a/docker/packaging/B09lintian b/docker/packaging/B09lintian
deleted file mode 100644 (file)
index 069a237..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-#
-# run lintian on the finished binary package
-
-apt-get install -y --force-yes lintian
-
-cd /tmp/buildd/*/debian/..
-
-echo "START LINTIAN"
-lintian || true
-echo "END LINTIAN"
diff --git a/docker/packaging/D10aptupdate b/docker/packaging/D10aptupdate
deleted file mode 100644 (file)
index b47ca03..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-# apt update
-
-apt-get update
diff --git a/docker/packaging/D11unsafeio b/docker/packaging/D11unsafeio
deleted file mode 100644 (file)
index 189f692..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# make sure we use force-unsafe-io
-installed="$(apt-cache policy dpkg | grep Installed | cut -d ' ' -f 4)"
-if $(dpkg --compare-versions "$installed" ge "1.15.8.6") && [ -z "$(grep '^force-unsafe-io' /etc/dpkg/dpkg.cfg)" ]; then 
-    echo "Setting force-unsafe-io for dpkg"
-    echo "force-unsafe-io" >> /etc/dpkg/dpkg.cfg
-fi
diff --git a/docker/packaging/D12aptupgrade b/docker/packaging/D12aptupgrade
deleted file mode 100644 (file)
index c47bd54..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-apt-get dist-upgrade -y --force-yes
diff --git a/docker/packaging/Dockerfile b/docker/packaging/Dockerfile
deleted file mode 100644 (file)
index ae4de18..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-FROM debian:jessie-backports
-
-MAINTAINER LEAP Encryption Access Project <info@leap.se>
-LABEL Description="Bare debian jessie baseimage with cowbuilder chroots for building packages" Vendor="LEAP" Version="1.x"
-
-RUN mkdir -p /var/cache/archive/mini-dinstall/incoming
-RUN mkdir /root/.pbuilder-hooks
-
-ADD ./pbuilderrc /root/.pbuilderrc
-ADD ./mini-dinstall.conf /root/.mini-dinstall.conf
-ADD ./dput.cf /root/.dput.cf
-ADD ./B09lintian /root/.pbuilder-hooks/B09lintian
-ADD ./D10aptupdate /root/.pbuilder-hooks/D10aptupdate
-ADD ./D11unsafeio /root/.pbuilder-hooks/D11unsafeio
-ADD ./D12aptupgrade /root/.pbuilder-hooks/D12aptupgradee
-
-RUN sed -i 's/httpredir/deb/' /etc/apt/sources.list
-RUN apt-get update \
-  && apt-get install -y --no-install-recommends \
-    git \
-    locales \
-    sudo \
-    cowbuilder \
-    devscripts \
-    ubuntu-archive-keyring \
-    dput \
-    mini-dinstall \
-    eatmydata \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
-
-RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
-ENV LANG en_US.utf8
-
-RUN useradd -ms /bin/bash -G sudo cirunner
-
-# allow all members of sudo group to execute any command without password
-RUN sed -i 's/^%sudo.*/%sudo ALL=(ALL) NOPASSWD:ALL/' /etc/sudoers
-
-RUN mkdir /var/cache/pbuilder/sid-i386 \
-  && DIST=sid ARCH=i386 cowbuilder --create --basepath /var/cache/pbuilder/sid-i386/base.cow --distribution sid --debootstrapopts --arch --debootstrapopts i386
-RUN mkdir /var/cache/pbuilder/sid-amd64 \
-  && DIST=sid ARCH=amd64 cowbuilder --create --basepath /var/cache/pbuilder/sid-amd64/base.cow --distribution sid --debootstrapopts --arch --debootstrapopts amd64
-RUN mkdir /var/cache/pbuilder/stretch-i386 \
-  && DIST=stretch ARCH=i386 cowbuilder --create --basepath /var/cache/pbuilder/stretch-i386/base.cow --distribution strecth --debootstrapopts --arch --debootstrapopts i386
-RUN mkdir /var/cache/pbuilder/stretch-amd64 \
-  && DIST=sid ARCH=amd64 cowbuilder --create --basepath /var/cache/pbuilder/stretch-amd64/base.cow --distribution stretch --debootstrapopts --arch --debootstrapopts amd64
-RUN mkdir /var/cache/pbuilder/jessie-i386 \
-  && DIST=jessie ARCH=i386 cowbuilder --create --basepath /var/cache/pbuilder/jessie-i386/base.cow --distribution jessie --debootstrapopts --arch --debootstrapopts i386
-RUN mkdir /var/cache/pbuilder/jessie-amd64 \
-  && DIST=jessie ARCH=amd64 cowbuilder --create --basepath /var/cache/pbuilder/jessie-amd64/base.cow --distribution jessie --debootstrapopts --arch --debootstrapopts amd64
-RUN mkdir /var/cache/pbuilder/vivid-i386 \
-  && DIST=vivid ARCH=i386 cowbuilder --create --basepath /var/cache/pbuilder/vivid-i386/base.cow --distribution vivid --debootstrapopts --arch --debootstrapopts i386
-RUN mkdir /var/cache/pbuilder/vivid-amd64 \
-  && DIST=vivid ARCH=amd64 cowbuilder --create --basepath /var/cache/pbuilder/vivid-amd64/base.cow --distribution vivid --debootstrapopts --arch --debootstrapopts amd64
-RUN mkdir /var/cache/pbuilder/wily-i386 \
-  && DIST=wily ARCH=i386 cowbuilder --create --basepath /var/cache/pbuilder/wily-i386/base.cow --distribution wily --debootstrapopts --arch --debootstrapopts i386
-RUN mkdir /var/cache/pbuilder/wily-amd64 \
-  && DIST=wily ARCH=amd64 cowbuilder --create --basepath /var/cache/pbuilder/wily-amd64/base.cow --distribution wily --debootstrapopts --arch --debootstrapopts amd64
-RUN mkdir /var/cache/pbuilder/xenial-i386 \
-  && DIST=xenial ARCH=i386 cowbuilder --create --basepath /var/cache/pbuilder/xenial-i386/base.cow --distribution xenial --debootstrapopts --arch --debootstrapopts i386
-RUN mkdir /var/cache/pbuilder/xenial-amd64 \
-  && DIST=xenial ARCH=amd64 cowbuilder --create --basepath /var/cache/pbuilder/xenial-amd64/base.cow --distribution xenial --debootstrapopts --arch --debootstrapopts amd64
-RUN mkdir /var/cache/pbuilder/yakkety-i386 \
-  && DIST=yakkety ARCH=i386 cowbuilder --create --basepath /var/cache/pbuilder/yakkety-i386/base.cow --distribution yakkety --debootstrapopts --arch --debootstrapopts i386
-RUN mkdir /var/cache/pbuilder/yakkety-amd64 \
-  && DIST=yakkety ARCH=amd64 cowbuilder --create --basepath /var/cache/pbuilder/yakkety-amd64/base.cow --distribution yakkety --debootstrapopts --arch --debootstrapopts amd64
diff --git a/docker/packaging/dput.cf b/docker/packaging/dput.cf
deleted file mode 100644 (file)
index fcdaec0..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-[local]
-method = local
-incoming = /var/cache/archive/mini-dinstall/incoming
-allow_non-us_software = 1
-run_dinstall = 0
-post_upload_command = mini-dinstall --batch
diff --git a/docker/packaging/mini-dinstall.conf b/docker/packaging/mini-dinstall.conf
deleted file mode 100644 (file)
index c92ee02..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-[DEFAULT]
-architectures = all, i386, amd64
-archivedir = /var/cache/archive/
-use_dnotify = 0
-verify_sigs = 0
-extra_keyrings = ~/.gnupg/pubring.gpg
-mail_on_success = 0
-archive_style = flat
-poll_time = 10
-mail_log_level = NONE
-
-[sid]
-
-[stretch]
-
-[jessie]
-
-[vivid]
-
-[wily]
-
-[xenial]
-
-[yakkety]
-
diff --git a/docker/packaging/pbuilderrc b/docker/packaging/pbuilderrc
deleted file mode 100644 (file)
index 0f3b26d..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-HOOKDIR="/root/.pbuilder-hooks"
-
-# Codenames for Debian suites according to their alias. Update these when
-# needed.
-UNSTABLE_CODENAME="sid"
-TESTING_CODENAME="stretch"
-STABLE_CODENAME="jessie"
-STABLE_BACKPORTS_SUITE="$STABLE_CODENAME-backports"
-
-# List of Debian suites.
-DEBIAN_SUITES=($UNSTABLE_CODENAME $TESTING_CODENAME $STABLE_CODENAME $STABLE_BACKPORTS_SUITE
-    "unstable" "testing" "stable")
-
-# List of Ubuntu suites. Update these when needed.
-UBUNTU_SUITES=("xenial" "wily" "vivid" "yakkety" "trusty")
-
-# Mirrors to use. Update these to your preferred mirror.
-DEBIAN_MIRROR="deb.debian.org"
-UBUNTU_MIRROR="mirrors.kernel.org"
-
-EXTRAPACKAGES=eatmydata
-EATMYDATA=yes
-
-export LD_PRELOAD=${LD_PRELOAD:+$LDPRELOAD:}libeatmydata.so
-PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-gdebi"
-
-PKGNAME_LOGFILE_EXTENTION="_$(dpkg --print-architecture).build"
-PKGNAME_LOGFILE=yes
-
-export DH_VERBOSE=1
-
-# Optionally use the changelog of a package to determine the suite to use if
-# none set.
-if [ -z "${DIST}" ] && [ -r "debian/changelog" ]; then
-    DIST=$(dpkg-parsechangelog | awk '/^Distribution: / {print $2}')
-    # Use the unstable suite for certain suite values.
-    if $(echo "experimental UNRELEASED" | grep -q $DIST); then
-        DIST="$UNSTABLE_CODENAME"
-    fi
-    # Use the stable suite for stable-backports.
-    if $(echo "$STABLE_BACKPORTS_SUITE" | grep -q $DIST); then
-        DIST="$STABLE_CODENAME"
-    fi
-fi
-
-# Optionally set a default distribution if none is used. Note that you can set
-# your own default (i.e. ${DIST:="unstable"}).
-: ${DIST:="$(lsb_release --short --codename)"}
-
-# Optionally change Debian codenames in $DIST to their aliases.
-case "$DIST" in
-    $UNSTABLE_CODENAME)
-        DIST="unstable"
-        ;;
-    $TESTING_CODENAME)
-        DIST="testing"
-        ;;
-    $STABLE_CODENAME)
-        DIST="stable"
-        ;;
-esac
-
-# Optionally set the architecture to the host architecture if none set. Note
-# that you can set your own default (i.e. ${ARCH:="i386"}).
-: ${ARCH:="$(dpkg --print-architecture)"}
-
-NAME="$DIST"
-if [ -n "${ARCH}" ]; then
-    NAME="$NAME-$ARCH"
-    DEBOOTSTRAPOPTS=("--arch" "$ARCH" "${DEBOOTSTRAPOPTS[@]}")
-fi
-#BASETGZ="/var/cache/pbuilder/$NAME-base.tgz"
-# Optionally, set BASEPATH (and not BASETGZ) if using cowbuilder
-BASEPATH="/var/cache/pbuilder/$NAME/base.cow/"
-DISTRIBUTION="$DIST"
-BUILDRESULT="/var/cache/pbuilder/$NAME/result/"
-APTCACHE="/var/cache/pbuilder/$NAME/aptcache/"
-BUILDPLACE="/var/cache/pbuilder/build/"
-BINDMOUNTS="/var/cache/archive"
-
-if $(echo ${DEBIAN_SUITES[@]} | grep -q $DIST); then
-    # Debian configuration
-    MIRRORSITE="http://$DEBIAN_MIRROR/debian/"
-    COMPONENTS="main contrib non-free"
-    DEBOOTSTRAPOPTS=("${DEBOOTSTRAPOPTS[@]}" "--keyring=/usr/share/keyrings/debian-archive-keyring.gpg")
-    OTHERMIRROR="deb file:///var/cache/archive $DIST/"
-
-elif $(echo ${UBUNTU_SUITES[@]} | grep -q $DIST); then
-    # Ubuntu configuration
-    MIRRORSITE="http://$UBUNTU_MIRROR/ubuntu/"
-    COMPONENTS="main restricted universe multiverse"
-    DEBOOTSTRAPOPTS=("${DEBOOTSTRAPOPTS[@]}" "--keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg")
-    OTHERMIRROR="deb file:///var/cache/archive $DIST/"
-else
-    echo "Unknown distribution: $DIST"
-    exit 1
-fi
diff --git a/docker/stretch_amd64/Dockerfile b/docker/stretch_amd64/Dockerfile
deleted file mode 100644 (file)
index 2db107b..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM debian:stretch
-
-MAINTAINER LEAP Encryption Access Project <info@leap.se>
-LABEL Description="Bare debian stretch baseimage with few customisation" Vendor="LEAP" Version="1.x"
-
-RUN sed -i 's/httpredir/deb/' /etc/apt/sources.list
-
-RUN apt-get update \
-  && apt-get -y dist-upgrade \
-  && apt-get install -y --no-install-recommends \
-    git \
-    leap-archive-keyring \
-    locales \
-    sudo && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN echo "deb http://deb.leap.se/testing-platform jessie main" > /etc/apt/sources.list.d/leap.list && \
-    apt-get update
-
-RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
-ENV LANG en_US.utf8
-
-RUN useradd -ms /bin/bash -G sudo cirunner
-
-# allow all members of sudo group to execute any command without password
-RUN sed -i 's/^%sudo.*/%sudo ALL=(ALL) NOPASSWD:ALL/' /etc/sudoers
diff --git a/docker/xenial_amd64/Dockerfile b/docker/xenial_amd64/Dockerfile
deleted file mode 100644 (file)
index 34d1c29..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-FROM ubuntu:16.04
-
-MAINTAINER LEAP Encryption Access Project <info@leap.se>
-
-COPY files/etc /etc
-
-RUN apt-get update \
-  && apt-get install -y --no-install-recommends \
-    git \
-    locales \
-    sudo \
-    ca-certificates \
-    wget
-
-RUN echo "deb http://deb.bitmask.net/debian xenial main" > /etc/apt/sources.list.d/leap-client-repo.list \
-  && wget -O- https://dl.bitmask.net/apt.key | apt-key add -
-
-RUN apt-get update \
-  && apt-get -y dist-upgrade \
-  && apt-get install -y --no-install-recommends leap-archive-keyring \
-  && apt-get clean && \
-     rm -rf /var/lib/apt/lists/*
-
-RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
-ENV LANG en_US.utf8
-
-RUN useradd -ms /bin/bash -G sudo cirunner
-
-# allow all members of sudo group to execute any command without password
-RUN sed -i 's/^%sudo.*/%sudo ALL=(ALL) NOPASSWD:ALL/' /etc/sudoers
diff --git a/docker/xenial_amd64/files/etc/apt/preferences.d/yakkety b/docker/xenial_amd64/files/etc/apt/preferences.d/yakkety
deleted file mode 100644 (file)
index 46ce76d..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Package: *
-Pin: release o=Ubuntu,n=yakkety
-Pin-Priority: 1
diff --git a/docker/xenial_amd64/files/etc/apt/sources.list b/docker/xenial_amd64/files/etc/apt/sources.list
deleted file mode 100644 (file)
index b23ef44..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-deb http://archive.ubuntu.com/ubuntu/ xenial main universe
-deb http://archive.ubuntu.com/ubuntu/ xenial-updates main universe
-deb http://archive.ubuntu.com/ubuntu/ xenial-security main universe
diff --git a/docker/xenial_amd64/files/etc/apt/sources.list.d/yakkety.list b/docker/xenial_amd64/files/etc/apt/sources.list.d/yakkety.list
deleted file mode 100644 (file)
index 8365fe3..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-deb http://archive.ubuntu.com/ubuntu/ yakkety main universe
-deb http://archive.ubuntu.com/ubuntu/ yakkety-updates main universe
-deb http://archive.ubuntu.com/ubuntu/ yakkety-security main universe
diff --git a/docker/yakkety_amd64/Dockerfile b/docker/yakkety_amd64/Dockerfile
deleted file mode 100644 (file)
index 73bc16a..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM ubuntu:16.10
-
-MAINTAINER LEAP Encryption Access Project <info@leap.se>
-
-COPY files/etc /etc
-
-RUN apt-get update \
-  && apt-get install -y --no-install-recommends \
-    git \
-    locales \
-    sudo \
-    ca-certificates \
-    wget
-
-# No yakkety dist in bitmask repo yet
-RUN echo "deb http://deb.bitmask.net/debian xenial main" > /etc/apt/sources.list.d/leap-client-repo.list \
-  && wget -O- https://dl.bitmask.net/apt.key | apt-key add -
-
-RUN apt-get update \
-  && apt-get -y dist-upgrade \
-  && apt-get install -y --no-install-recommends leap-archive-keyring \
-  && apt-get clean && \
-     rm -rf /var/lib/apt/lists/*
-
-RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
-ENV LANG en_US.utf8
-
-RUN useradd -ms /bin/bash -G sudo cirunner
-
-# allow all members of sudo group to execute any command without password
-RUN sed -i 's/^%sudo.*/%sudo ALL=(ALL) NOPASSWD:ALL/' /etc/sudoers
diff --git a/docker/yakkety_amd64/files/etc/apt/sources.list b/docker/yakkety_amd64/files/etc/apt/sources.list
deleted file mode 100644 (file)
index 8365fe3..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-deb http://archive.ubuntu.com/ubuntu/ yakkety main universe
-deb http://archive.ubuntu.com/ubuntu/ yakkety-updates main universe
-deb http://archive.ubuntu.com/ubuntu/ yakkety-security main universe