From 635f382ac92b3444703209143e6482532d450853 Mon Sep 17 00:00:00 2001
From: Varac <varac@leap.se>
Date: Tue, 29 Aug 2017 20:20:44 +0200
Subject: Remove dockerfiles, they moved into their projects

---
 docker/README.md          | 24 ------------------------
 docker/android/Dockerfile | 23 -----------------------
 docker/soledad/Dockerfile | 31 -------------------------------
 3 files changed, 78 deletions(-)
 delete mode 100644 docker/README.md
 delete mode 100644 docker/android/Dockerfile
 delete mode 100644 docker/soledad/Dockerfile

(limited to 'docker')

diff --git a/docker/README.md b/docker/README.md
deleted file mode 100644
index 454a681..0000000
--- a/docker/README.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# Build new image
-
-As an example we build a new version of the `leap:jessie` base image:
-
-    REGISTRY="0xacab.org:4567"
-    REGISTRY_PATH="${REGISTRY}/leap/gitlab-buildpackage"
-    IMAGE='jessie_amd64'
-
-    cd $IMAGE
-    docker ${DOCKER_OPTS} build ${DOCKER_BUILD_OPTS} -t ${REGISTRY_PATH}:${IMAGE} .
-
-## Package upgrades
-
-Sometimes you need to upgrade packages in the base image,
-so this is not done on every build, i.e. when security updates
-are available.
-Disable caching and build new images with:
-
-    export DOCKER_BUILD_OPTS="--no-cache"
-
-## Push images
-
-    docker login --username=varac 0xacab.org:4567
-    docker ${DOCKER_OPTS} push ${REGISTRY_PATH}:${IMAGE}
diff --git a/docker/android/Dockerfile b/docker/android/Dockerfile
deleted file mode 100644
index 68d90ac..0000000
--- a/docker/android/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-# See https://about.gitlab.com/2016/11/30/setting-up-gitlab-ci-for-android-projects/
-FROM openjdk:8-jdk
-
-MAINTAINER LEAP Encryption Access Project <info@leap.se>
-LABEL Description="Android baseimage based on openjdk:8-jdk" Vendor="LEAP" Version="1.x"
-
-ENV ANDROID_COMPILE_SDK "25"
-ENV ANDROID_BUILD_TOOLS "25.0.1"
-ENV ANDROID_SDK_TOOLS "25.2.3"
-ENV LANG en_US.utf8
-
-RUN apt-get --quiet update --yes \
-  && apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1
-RUN wget --output-document=android-sdk.zip "https://dl.google.com/android/repository/tools_r${ANDROID_SDK_TOOLS}-linux.zip" \
-  && unzip android-sdk.zip && rm android-sdk.zip
-
-RUN echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter "android-${ANDROID_COMPILE_SDK}"
-RUN echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter platform-tools
-RUN echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter "build-tools-${ANDROID_BUILD_TOOLS}"
-RUN export ANDROID_HOME="$PWD/android-sdk-linux"
-RUN export PATH="$PATH:$PWD/android-sdk-linux/platform-tools/"
-
-RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
diff --git a/docker/soledad/Dockerfile b/docker/soledad/Dockerfile
deleted file mode 100644
index 3a1f8bc..0000000
--- a/docker/soledad/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-# start with a fresh debian image
-# we use backports because of libsqlcipher-dev
-FROM 0xacab.org:4567/leap/gitlab-buildpackage:jessie_amd64
-
-RUN apt-get update
-RUN apt-get -y dist-upgrade
-
-# needed to build python twisted module
-RUN apt-get -y install --no-install-recommends libpython2.7-dev \
-  # add unbuffer and ts for timestamping
-  moreutils expect tcl8.6 \
-  # needed to build python cryptography module
-  libssl-dev libffi-dev \
-  # needed to build pysqlcipher
-  libsqlcipher-dev \
-  # needed to support keymanager
-  libsqlite3-dev \
-  # install pip, so later we can install tox
-  python-pip \
-  # used to show connection to couchdb during CI
-  curl \
-  # needed to build pysqlcipher module
-  build-essential
-
-# We need git from backports because it has
-# the "%cI: committer date, strict ISO 8601 format"
-# pretty format which is used by pytest-benchmark
-RUN apt-get -y install -t jessie-backports git
-
-RUN pip install -U pip
-RUN pip install tox
-- 
cgit v1.2.3