summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2017-04-25 12:26:40 -0400
committerMicah Anderson <micah@riseup.net>2017-04-25 12:26:40 -0400
commit47979a6035b590a0197732400e15d8d92b467580 (patch)
treea019c27b767c7853e7aabd5751ba35bd26d943e6
parent76a907103d24319c942058e36c4fa3b5016e75a0 (diff)
move to git@0xacab.org:leap-docker/ruby.git and git@0xacab.org:leap-docker/debian.git
-rw-r--r--docker/jessie_amd64/Dockerfile31
-rw-r--r--docker/jessie_amd64/files/etc/ssh/ssh_known_hosts2
-rw-r--r--docker/packaging/Dockerfile3
-rw-r--r--docker/ruby/Dockerfile29
4 files changed, 2 insertions, 63 deletions
diff --git a/docker/jessie_amd64/Dockerfile b/docker/jessie_amd64/Dockerfile
deleted file mode 100644
index 6481f63..0000000
--- a/docker/jessie_amd64/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM debian:jessie-backports
-
-MAINTAINER LEAP Encryption Access Project <info@leap.se>
-LABEL Description="Bare debian jessie baseimage with few customisation" Vendor="LEAP" Version="1.x"
-
-
-RUN sed -i 's/httpredir/deb/' /etc/apt/sources.list && \
- sed -i 's/httpredir/deb/' /etc/apt/sources.list.d/backports.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
-
-COPY files/etc /etc/
diff --git a/docker/jessie_amd64/files/etc/ssh/ssh_known_hosts b/docker/jessie_amd64/files/etc/ssh/ssh_known_hosts
deleted file mode 100644
index 91b0b33..0000000
--- a/docker/jessie_amd64/files/etc/ssh/ssh_known_hosts
+++ /dev/null
@@ -1,2 +0,0 @@
-|1|5mAeSRDqPhhetliGX/qXBFwGwrw=|S5Tn6EzFI5/APpi90t0i0UfAXnI= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFW7XXj7XoBBGa5nJ2zGIhOp3r41g6VWnsjmHPEHncaP
-|1|d40UZrdz00EiCkDesCP0XpWfXcc=|Zg+3zgeyF5WVgE5ZaxVftWqHjYw= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFW7XXj7XoBBGa5nJ2zGIhOp3r41g6VWnsjmHPEHncaP
diff --git a/docker/packaging/Dockerfile b/docker/packaging/Dockerfile
index d746ae9..ae4de18 100644
--- a/docker/packaging/Dockerfile
+++ b/docker/packaging/Dockerfile
@@ -24,7 +24,8 @@ RUN apt-get update \
devscripts \
ubuntu-archive-keyring \
dput \
- mini-dinstall\
+ mini-dinstall \
+ eatmydata \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
diff --git a/docker/ruby/Dockerfile b/docker/ruby/Dockerfile
deleted file mode 100644
index fa48171..0000000
--- a/docker/ruby/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM 0xacab.org:4567/leap/gitlab-buildpackage:jessie_amd64
-
-MAINTAINER LEAP Encryption Access Project <info@leap.se>
-LABEL Description="Ruby 2.1 build tools to build leap_cli etc" Vendor="LEAP" Version="3.x"
-
-# install leap_cli prerequisites, see https://0xacab.org/leap/leap_cli
-# and tools needed for ci (moreutils and expect)
-RUN apt-get update \
- && apt-get install -y --no-install-recommends \
- ruby \
- ruby-dev \
- build-essential \
- rsync \
- openssh-client \
- openssl \
- rake \
- gcc \
- make \
- zlib1g-dev \
- moreutils \
- tcl \
- expect \
- jq \
- netcat \
- && apt-get clean \
- && rm -rf /var/lib/apt/lists/*
-
-RUN echo '---\n:sources:\n - https://rubygems.org/\ninstall: --no-document\nupdate: --no-document\n' > /etc/gemrc
-RUN gem install bundler