From 65e71becf46d1c3b47a97bc109fbb45e35a5efe0 Mon Sep 17 00:00:00 2001
From: Drew Larson <drew@drwlrsn.com>
Date: Mon, 23 Jan 2017 19:44:49 -0600
Subject: [PATCH] Fix-up for CI (#26)

* Update path.

* Add hint to label.

* Add shipable config.

* Move.

* Add docker integration.

* Not needed.

* Specify host.

* Tag image.

* add push

* Try Travis.

* Fix dockerfile.

* Update.

* Use generic language.

* Only push when master.
---
 .travis.yml   |  9 +++++++++
 Dockerfile    |  4 ++--
 shippable.yml | 15 ---------------
 3 files changed, 11 insertions(+), 17 deletions(-)
 create mode 100644 .travis.yml
 delete mode 100644 shippable.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..e291d78
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,9 @@
+language: generic
+services:
+  - docker
+before_install:
+  - docker build -t bcbc/workstand:production .
+after_success:
+  - if [ "$TRAVIS_BRANCH" == "master" ]; then
+    docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
+    docker push bcbc/workstand:production;
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 423c036..5769a56 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,8 +6,8 @@ RUN mkdir /code
 WORKDIR /code
 RUN mkdir requirements
 ADD bikeshop_project /code
-ADD requirements /code/requirements/base.txt
-ADD requirements /code/requirements/production.txt
+ADD requirements/base.txt /code/requirements/base.txt
+ADD requirements/production.txt /code/requirements/production.txt
 RUN pip install -r requirements/production.txt
 RUN npm cache clean
 ADD ./bikeshop_project/bower.json bower.json
diff --git a/shippable.yml b/shippable.yml
deleted file mode 100644
index 8e0bd98..0000000
--- a/shippable.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Language setting
-language: python
-
-# Version number
-python:
-  - "3.6"
-
-build:
-  cache: true
-  env:
-    - secure: stCGu2o9rdpGLek5SVL3d5+7XZw1aSbKV1F5c63M+xSDSvteK9B2/Qxjqc0FA5kigXAtpRdZIBp6/TrrIe3fNb6O77ATIZnIC19lAlxY9F80J5em1TkDSX8PRFoz3yuhNm/DpBYzytMjf57IQq4VlxLm3jms8hgCjMG2HeCKe9KqomUJ7hg7HBlPHnR/WqayQxnUnHkVe9MKKXxHjD2kL1Z4PFBM/fc5I5kNiJYhvmeoXPyvT8G6HKK9ZXG8Bw9OF/PtB7xI3/3ElqMEccHj+Ff66/a6rm5sMxbd2aOq8I0LTHXmONs+wsMniwcb1MIiO0Pc9sP9HbU0iGnnBrnmWA==
-  post_ci:
-    - docker commit $SHIPPABLE_CONTAINER_NAME bcbc/workstand:production
-push:
-    - docker push drwlrsn/workstand:production
\ No newline at end of file