publish the docker image

Author: bcavagnolo

.travis.yml

@@ -1,5 +1,10 @@
 services: docker
 
+env:
+  global:
+    - DOCKER_USERNAME: planetdatalake
+    - secure: cF1f4bTOi52fyPcsJnaOOr33ghNZUQPnHEOwtXaRX0fZ1X6mRW9XrFOaMScZOhWEIlV7RteuEIoxIaJVN8ZWKHVZIh7/815quUmcOMhTRboHHMnGQPaXDYEmmhbPEg1uxjKTrGBRD5L/KZ2XUFqkobgb17Ju1QAH+K91hJJ6qes=
+
 _python_template: &_python_template
   language: python
   stage: test
@@ -40,3 +45,10 @@ jobs:
     stage: test
     script:
       - make test
+    deploy:
+      provider: script
+      script:
+        - make push
+      on:
+        branch: master
+        repo: planetlabs/datalake

Dockerfile

@@ -45,14 +45,16 @@ COPY . /opt/
 # the container and used for development. That is, the python paths and paths
 # to console scripts Just Work (TM)
 ENV PYTHONPATH=/opt/common:/opt/client:/opt/ingester:/opt/api
-RUN cd /opt/client && \
+RUN for d in client ingester api; do \
+    cd /opt/$d && \
     python setup.py develop -s /usr/local/bin \
-        --egg-path ../../../../../opt/client/ \
+        --egg-path ../../../../../opt/$d/ \
         -d /usr/local/lib/python2.7/site-packages/ \
-        --no-deps;
+        --no-deps; \
+    done
 
 ARG VERSION=unspecified
 ENV VERSION=$VERSION
 
 WORKDIR /opt
-ENTRYPOINT ["/usr/local/bin/datalake"]
+ENTRYPOINT ["/opt/docker_entry.sh"]

Makefile

@@ -1,21 +1,35 @@
 VERSION=$(shell git describe --tags --dirty)
+REPO=planetlabs
+IMAGE="$(REPO)/datalake:$(VERSION)"
 
 .PHONY: docker # build the docker container
 docker:
-	docker build --build-arg VERSION=$(VERSION) -t datalake:$(VERSION) .
+	docker build --build-arg VERSION=$(VERSION) -t $(IMAGE) .
 
 .PHONY: devshell  # Open a developer shell in the docker env
 devshell: docker
-	docker run --rm -it -v $$PWD:/opt --entrypoint /bin/bash datalake:$(VERSION)
+	docker run --rm -it -v $$PWD:/opt --entrypoint /bin/bash $(IMAGE)
 
 .PHONY: test  # Run the tests
-
 test: docker
 	echo VERSION=$(VERSION)
 	for p in common client ingester api; do \
-		docker run --rm -it --entrypoint py.test datalake:$(VERSION) $$p; \
+		docker run --rm -it --entrypoint py.test $(IMAGE) $$p; \
 	done
 
+.PHONY: push
+push:
+ifeq ($(DOCKER_USERNAME),)
+	echo "You must set DOCKER_USERNAME"
+	exit 1
+endif
+ifeq ($(DOCKER_PASSWORD),)
+	echo "You must set DOCKER_PASSWORD"
+	exit 1
+endif
+	echo "$(DOCKER_PASSWORD)" | docker login -u "$(DOCKER_USERNAME)" --password-stdin && \
+	docker push $(IMAGE)
+
 .PHONY: help  # Generate list of targets with descriptions
 help:
 	@grep '^.PHONY: .* #' Makefile | sed 's/\.PHONY: \(.*\) # \(.*\)/  \1: \2/' | expand -t20

api/setup.py

@@ -54,7 +54,6 @@ def get_version():
           'pyver>=1.0.18',
           'memoized_property>=1.0.2',
           'simplejson>=3.3.1',
-          'datalake-common>=0.25',
           'Flask>=0.10.1',
           'flask-swagger==0.2.8',
           'boto3==1.1.3',

docker_entry.sh

@@ -0,0 +1,48 @@
+#!/bin/sh
+
+HERE=$(cd `dirname "$0"` && pwd)
+
+usage() {
+    cat <<EOF
+datalake docker entry script
+
+Usage: docker_entry.sh <command> <args>
+
+Valid commands include:
+
+help: print this message
+
+datalake: the datalake client
+
+api: the datalake API server
+
+ingester: the datalake ingester
+
+EOF
+}
+
+case "$1" in
+    "help")
+        usage
+        ;;
+    "datalake")
+        shift
+        /usr/local/bin/datalake "$@"
+        ;;
+    "api")
+        shift
+        FLASK_APP=/opt/api/datalake_api/app.py flask run "$@"
+        ;;
+    "ingester")
+        shift
+        /usr/local/bin/datalake_tool "$@"
+        ;;
+    "")
+        echo "ERROR: Please specify a command."
+        usage
+        exit 1
+        ;;
+    *)
+        usage
+        exit 1
+esac

ingester/setup.py

@@ -51,12 +51,9 @@ def get_version():
       author_email='[email protected]',
       packages=['datalake_ingester'],
       install_requires=[
-          'pyver>=1.0.18',
           'boto>=2.38.0',
-          'configargparse>=0.9.3',
           'memoized_property>=1.0.2',
           'simplejson>=3.3.1',
-          'datalake-common>=0.26',
           'raven>=5.6.0',
           'click>=5.1',
       ],