merge master

.dockerignore

@@ -0,0 +1,11 @@
+dist
+build
+igneous.egg-info
+*.so
+.eggs
+*.pyc
+__pycache__
+.cache
+test.py
+pipeline.py
+.pytest_cache

.travis.yml

@@ -1,8 +1,5 @@
 language: python
 python:
-- '2.7'
-- '3.4'
-- '3.5'
 - '3.6'
 dist: trusty
 sudo: required
@@ -13,12 +10,12 @@ before_install:
 - sudo mv secrets /secrets && sudo chown $USER /secrets
 - sudo mkdir -p $HOME/.cloudvolume
 - sudo ln -s /secrets $HOME/.cloudvolume/secrets
-- $(python version.py)
+- $(python igneous_version.py)
 script:
 - docker build --tag seunglab/igneous:$APPVERSION . || travis_terminate 1
 - docker run -it -v /secrets:/secrets seunglab/igneous:$APPVERSION /bin/sh -c "cd /igneous
  && py.test -v -x test" || travis_terminate 1; 
-- docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" || travis_terminate 1; 
+- echo "$DOCKER_PASSWORD" | docker login -u="$DOCKER_USERNAME" --password-stdin || travis_terminate 1; 
 - if [ "$TRAVIS_BRANCH" == "master" ];
  then 
  docker push seunglab/igneous || travis_terminate 1; 

Dockerfile

@@ -1,48 +1,32 @@
-FROM python:3.4
-MAINTAINER William Silversmith
-# This image contains private keys, make sure the image is not pushed to docker hub or any public repo.
-## INSTALL gsutil
-# Prepare the image.
-ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update && apt-get install -y -qq --no-install-recommends \
- apt-utils \
- curl \
- git \
- openssh-client \
- python-openssl \
- python \
- python-pip \
- python-dev \
-# python-h5py \
- python-numpy \
- python-setuptools \
- libboost-all-dev \
-# libhdf5-dev \
- liblzma-dev \
- libgmp-dev \
-# libmpfr-dev \
-# libxml2-dev \
- screen \
- software-properties-common \
- unzip \
- vim \
- wget \
- zlib1g-dev \
- && apt-get clean \
- && rm -rf /var/lib/apt/lists/*
-
-RUN pip install setuptools Cython wheel numpy 
+FROM python:3.6-slim
+LABEL maintainer="William Silversmith, Nico Kemnitz"
 
-# install neuroglancer
-RUN mkdir /.ssh
 ADD ./ /igneous
-RUN pip install -r /igneous/requirements.txt 
-RUN pip install pyasn1 --upgrade
-RUN cd /igneous && pip install -e .
+RUN apt-get update \
+ # Build dependencies
+ && apt-get install -y -qq --no-install-recommends \
+ git \
+ libboost-dev \
+ build-essential \
+ # igneous + runtime dependencies
+ && cd igneous \
+ && pip install --no-cache-dir -r requirements.txt \
+ && pip install --no-cache-dir -e . \
+ \
+ # Cleanup build dependencies
+ && apt-get remove --purge -y \
+ libboost-dev \
+ build-essential \
+ && apt-get autoremove --purge -y \
+ # Cleanup apt
+ && apt-get clean \
+ && rm -rf /var/lib/apt/lists/* \
+ # Cleanup temporary python files
+ && find /usr/local/lib/python3.6 -depth \
+ \( \
+ \( -type d -a \( -name __pycache__ \) \) \
+ -o \
+ \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
+ \) -exec rm -rf '{}' +
 
 CMD python /igneous/igneous/task_execution.py
-
-
-
-
-