Merge pull request #1 from Syncano/master

Kence Anderson · Kence Anderson · commit caa74bcf36fd · 2016-01-06T10:01:37.000-08:00
Merge 010616
diff --git a/.dockercfg.template b/.dockercfg.template
@@ -0,0 +1 @@
+{"<REGISTRY>":{"auth":"<AUTH>","email":"<EMAIL>"}}
diff --git a/Dockerfile b/Dockerfile
@@ -1,25 +1,30 @@
-FROM python:2.7
-
+FROM ubuntu:trusty
 MAINTAINER "Syncano DevOps Team" <devops@syncano.com>
 
-ENV LAST_REFRESHED 2015-12-11
+ENV LAST_REFRESHED 2015-12-17
+ENV export SYNCANO_APIROOT='https://api.syncano.io/'
+
+COPY requirements.txt /tmp/requirements.txt
+COPY external_requirements.txt /tmp/external_requirements.txt
 
 RUN apt-get update && apt-get install -qqy \
     git \
     libffi-dev \
     libssl-dev \
-    libjpeg-dev
-
-ENV export SYNCANO_APIROOT='https://api.syncano.io/'
-
-COPY requirements.txt /tmp/requirements.txt
-COPY external_requirements.txt /tmp/external_requirements.txt
-RUN pip install -r /tmp/requirements.txt \
+    libjpeg-dev \
+    python-dev \
+    wget \
+    && wget https://bootstrap.pypa.io/get-pip.py \
+    && python get-pip.py \
+    && pip install --upgrade pip \
+    && pip install -r /tmp/requirements.txt \
     && pip install -r /tmp/external_requirements.txt
 
-RUN chmod 1777 /tmp
 # create a special user to run code
 # user without root privileges greatly improves security
-RUN groupadd -r syncano && useradd -r -g syncano syncano
-USER syncano
+RUN groupadd -r syncano \
+    && useradd -r -g syncano syncano
+RUN chmod 1777 /tmp
 
+USER syncano
+CMD ["python"]
diff --git a/circle.yml b/circle.yml
@@ -0,0 +1,22 @@
+machine:
+  services:
+    - docker
+
+dependencies:
+  override:
+    - sed -i 's/CMD/#CMD/g' Dockerfile
+    - docker build -t quay.io/syncano/python-codebox .
+
+test:
+  override:
+    -  docker run -it -v `pwd`/test.py:/tmp/test.py quay.io/syncano/python-codebox python /tmp/test.py
+
+deployment:
+  production:
+    branch:
+      - master
+    commands:
+      - sed -e "s|<REGISTRY>|$DOCKER_REGISTRY|g" -e "s|<EMAIL>|$DOCKER_EMAIL|g" -e "s|<AUTH>|$DOCKER_AUTH|g" < .dockercfg.template > ~/.dockercfg
+      - sed -i 's/#CMD/CMD/g' Dockerfile
+      - docker build -t quay.io/syncano/python-codebox .
+      - docker push quay.io/syncano/python-codebox
diff --git a/external_requirements.txt b/external_requirements.txt
@@ -1,3 +1,3 @@
 -i https://pypi.fury.io/Nx-poGuiakLbsCzaLwNm/aexol
-aexol==0.1
+aexol==0.1.2
 
diff --git a/test.py b/test.py
@@ -0,0 +1,5 @@
+if __name__ == '__main__':
+    import pkgutil
+    modules = (name for _, name, is_pkg in pkgutil.iter_modules()
+               if is_pkg)
+    map(__import__, modules)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+{"<REGISTRY>":{"auth":"<AUTH>","email":"<EMAIL>"}}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`-i https://pypi.fury.io/Nx-poGuiakLbsCzaLwNm/aexol`
`2`		`-aexol==0.1`
	`2`	`+aexol==0.1.2`
`3`	`3`