Merge 0acd97a into 4d41247

.dockerignore

@@ -0,0 +1,9 @@
+.git
+.venv
+*.yml
+*.md
+*.png
+*.ini
+docs
+examples
+tests

.travis.yml

@@ -1,18 +1,11 @@
 language: python
-sudo: required
-services:
-- docker
 python:
 - 2.7
 - 3.5
 - 3.6
 install:
   - pip install tox-travis
   - pip install coveralls
-env:
-  global:
-    - secure: "aayKlfqIU/usydWSBz9FQnDWkzH6k4Uoz/aQmEDDB6ziSB9Y7AkszZKJ112aCGN2Zxqde0JTRIPQkAtniH8r1ZPvcoG+4ew31/cz8wolBE9OZs+wSsoWis57EwC/N/xjngvji5ENd3scRULOZciS8KUlqchRzAfcCM+sxPROJ38a3n2oA63IvSVMzbrSGyE2MukxE+bOyXeKtM9upyOC6nGEjcyb7nOdTQz8UcRzxnIIed4W9WpZqhK5gUbmZMlZSpXhu8upgXdrkooDgVLcpH65OaDfRMtExuTEV2CRxWPZLghxNaDgGVui9VbX9nUxOIe8nLwT0FpDr/fiDGn1StBBoy/6XbAbkWsy3PhLRNvXN9dvhKunCmjGs6W2qT6Ems0HmePrHJx2mtI/dGPQAxknDHY6YjMSqtMfbrOJFOerqQ6UI6YmYiBOMfgC36thIa11Pr6VFtGFtn12XTFw3ZmbBIrQ/EB7YtHAvK6w8oX1+Q//UJjTR9Vs8ZPZPcq376WxaNkc15EvHbQ28ZZOjtRyCDz8+0gNcBgx+EY9nt/1lWcLZ/wHLSFjGJtCMZhnfdE7IsJHnG31SpnumweSdQG4/Ngeo1fQYIXTX6eOt7hOJvkRCuzRJTxDQbD9KYXYs3ZmJYuAxVVlV25fmTaniHj6O5llbNwX5vvaYO6/YRY="
-    - secure: "T5Kbh4QRvETRSaRKVjeu6Tap8TLvtePHaxerJM9ZQn0mH5c+LLjbQvWhtMfZ+Te0GiTy4CZZFybPjt5qpNrQrk8bi2BOjwYNwL7gJyMHKC7hPLfx6zYn+6aZAIR82egz+wIh/LS8cHWbHFNKT1Yj34sUaqt+7PTtLdI8o/rk98R/yd0vQEHFiNy//PLvzHp5OJ40LuT+pYrD9swpQAMBKVHr5pFZEInZga66CT4FdHKs1fpzOWpYm+wDUJ1bhgZAESz+ ZaMNG+wGIRwJeete7A3Qglo2i07wGfpqi6m0pEt4H07uw+4q5EEqRVJq+V/uPC18CcTvjrHq7zcawPhP+Q57bIWd2tqMkEv+RqOIDG7xKU2USlex5AeJ8vUDQ3wq7FpcWXb0h9X8afUMRWOck9R3X0QJnXRtQ3M+bRwncmJHvk0Nb5VhTQ2vlewFrUISZEXdeambirsj1x1AMksIbQCnzQoALB8pzjgmfde5sgw5oBWbIv1EKYxmPa+kOayiXxNrKTgfUTaPMfAbN27uF y1CqrpcRUAMLurTitnbavZlFvyCO+wcdP/tB8E0jIQ2juFAp/8RKMI6Mf0LsVOWzsFrjYwhq6Ehc0QvJI8adE0QuBlV1dMjFwg1KIHrvFeFlKPuSB2w1SIrN51wcohMfETbpj7NAYTLVKEzQo/3Wxc="
 deploy:
   - provider: pypi
     user: mirucha
@@ -21,11 +14,6 @@ deploy:
     on:
       tags: true
       branch: master
-  - provider: script
-    script: bash docker_push.sh
-    on:
-      tags: true
-      branch: master
 script:
 - tox
 after_success:

Dockerfile

@@ -0,0 +1,15 @@
+FROM python:3.6-alpine
+
+COPY docker/config.txt /etc/napalm/logs
+COPY ./ /var/cache/napalm-logs/
+
+# Install napalm-logs and pre-requisites
+RUN apk add --no-cache \
+    libffi \
+    libffi-dev \
+    python-dev \
+    build-base \
+    && pip --no-cache-dir install cffi /var/cache/napalm-logs/ \
+    && rm -rf /var/cache/napalm-logs/
+
+CMD napalm-logs --config-file /etc/napalm/logs

docker/Makefile

@@ -1,22 +1,20 @@
 NAME := napalm_logs
-# This is the version of napalm-logs that will be installed
-VERSION ?= $(shell cat ../VERSION)
 # This can be changed to build with different BUILD_REQS
-INTERATION := 0
+VERSION ?= $(shell git describe --tags $(git rev-list --tags --max-count=1))
 
 ## To specify which dependencies to install please set BUILD_REQS
 ## For example:
 ## make BUILD_REQS="kafka tornado" build
 
-IMAGE = $(NAME):$(VERSION)-${INTERATION}
+IMAGE = $(NAME):$(VERSION)
 REPO ?= mirceaulinic/napalm-logs
 
 DOCKERFILE ?= Dockerfile
-DOCKER_BUILD_CONTEXT ?= .
+DOCKER_BUILD_CONTEXT ?= $(dir $(abspath $(PWD)../))
 
 .PHONY: build
 build: clean
-	docker build -f $(DOCKERFILE) -t $(IMAGE) $(DOCKER_BUILD_CONTEXT) --build-arg requirements="${BUILD_REQS}" --build-arg version="${VERSION}"
+	docker build -f ../$(DOCKERFILE) -t $(IMAGE) $(DOCKER_BUILD_CONTEXT) --build-arg requirements="${BUILD_REQS}"
 
 .PHONY: publish
 publish: build

setup.py

@@ -8,9 +8,6 @@
 
 __author__ = 'Mircea Ulinic <mircea.ulinic@gmail.com>'
 
-with open('VERSION', 'r') as fp_:
-    version = fp_.read()
-
 with codecs.open('README.rst', 'r', encoding='utf8') as file:
     long_description = file.read()
 
@@ -19,7 +16,7 @@
 
 setup(
     name='napalm-logs',
-    version=version,
+    version='0.7.0',
     packages=find_packages(),
     author='Mircea Ulinic',
     author_email='mircea.ulinic@gmail.com',