v1.6.5 Merge

CHANGELOG.md

@@ -1,7 +1,26 @@
 # Change Log
 
-## [v1.6.4](https://github.com/Boerderij/Varken/tree/v1.6.4) (2019-02-03)
-[Full Changelog](https://github.com/Boerderij/Varken/compare/1.6.3...v1.6.4)
+## [v1.6.5](https://github.com/Boerderij/Varken/tree/v1.6.5) (2019-03-11)
+[Full Changelog](https://github.com/Boerderij/Varken/compare/v1.6.4...v1.6.5)
+
+**Implemented enhancements:**
+
+- \[Feature Request\] Add new "relayed" and "secure" to Tautulli data pushed to influx [\#114](https://github.com/Boerderij/Varken/issues/114)
+- \[BUG\] Changes to Tautulli breaks Varken `TypeError` `Secure` `relayed` [\#111](https://github.com/Boerderij/Varken/issues/111)
+
+**Fixed bugs:**
+
+- \[BUG\] Handle GeoIP Downloads better [\#113](https://github.com/Boerderij/Varken/issues/113)
+- \[BUG\] - "None" outputted to stdout many times with no benefit? [\#105](https://github.com/Boerderij/Varken/issues/105)
+- \[BUG\] windows file open error [\#104](https://github.com/Boerderij/Varken/issues/104)
+- \[BUG\] Not catching DB url resolve [\#103](https://github.com/Boerderij/Varken/issues/103)
+
+**Merged pull requests:**
+
+- v1.6.5 Merge [\#115](https://github.com/Boerderij/Varken/pull/115) ([samwiseg0](https://github.com/samwiseg0))
+
+## [1.6.4](https://github.com/Boerderij/Varken/tree/1.6.4) (2019-02-04)
+[Full Changelog](https://github.com/Boerderij/Varken/compare/1.6.3...1.6.4)
 
 **Fixed bugs:**
 

Dockerfile.arm

@@ -6,8 +6,6 @@ ENV DEBUG="False"
 
 WORKDIR /app
 
-COPY /qemu-arm-static /usr/bin/qemu-arm-static
-
 COPY /requirements.txt /Varken.py /app/
 
 COPY /varken /app/varken

Dockerfile.arm64

@@ -6,8 +6,6 @@ ENV DEBUG="False"
 
 WORKDIR /app
 
-COPY /qemu-aarch64-static /usr/bin/qemu-aarch64-static
-
 COPY /requirements.txt /Varken.py /app/
 
 COPY /varken /app/varken

Jenkinsfile

@@ -0,0 +1,126 @@
+pipeline {
+    agent none
+    environment {
+        DOCKER_REPO = "boerderij/varken"
+        GIT_REPO = 'Boerderij/Varken'
+        VERSION_FILE = "varken/__init__.py"
+        FLAKE_FILES = "Varken.py varken/*.py"
+        TAG = ""
+        GIT_TOKEN = credentials('github-jenkins-token')
+    }
+    stages {
+        stage('Flake8') {
+            agent { label 'amd64'}
+            steps {
+                sh """
+                    python3 -m venv venv && venv/bin/pip install flake8 && venv/bin/python -m flake8 --max-line-length 120 ${FLAKE_FILES}
+                    rm -rf venv/
+                """
+                script {
+                    TAG = sh(returnStdout: true, script: 'grep -i version ${VERSION_FILE} | cut -d" " -f3 | tr -d \\"').trim()
+                }
+            }
+        }
+        stage('Docker Builds') {
+            parallel {
+                stage('amd64') {
+                    when {
+                        anyOf {
+                            branch 'master'
+                            branch 'develop'
+                        }
+                    }
+                    agent { label 'amd64'}
+                    steps {
+                        script {
+                            if (BRANCH_NAME == 'master') {
+                                def image = docker.build("${DOCKER_REPO}:${TAG}-amd64")
+                                image.push()
+
+                            } else if (BRANCH_NAME == 'develop') {
+                                def image = docker.build("${DOCKER_REPO}:develop-amd64")
+                                image.push()
+                            }
+                        }
+                    }
+                }
+                stage('ARMv6') {
+                    when {
+                        anyOf {
+                            branch 'master'
+                            branch 'develop'
+                        }
+                    }
+                    agent { label 'arm64'}
+                    steps {
+                        script {
+                            if (BRANCH_NAME == 'master') {
+                                def image = docker.build("${DOCKER_REPO}:${TAG}-arm", "-f Dockerfile.arm .")
+                                image.push()
+                            } else if (BRANCH_NAME == 'develop') {
+                                def image = docker.build("${DOCKER_REPO}:develop-arm", "-f Dockerfile.arm .")
+                                image.push()
+                            }
+                        }
+                    }
+                }
+                stage('ARM64v8') {
+                    when {
+                        anyOf {
+                            branch 'master'
+                            branch 'develop'
+                        }
+                    }
+                    agent { label 'arm64'}
+                    steps {
+                        script {
+                            if (BRANCH_NAME == 'master') {
+                                def image = docker.build("${DOCKER_REPO}:${TAG}-arm64", "-f Dockerfile.arm64 .")
+                                image.push()
+                            } else if (BRANCH_NAME == 'develop') {
+                                def image = docker.build("${DOCKER_REPO}:develop-arm64", "-f Dockerfile.arm64 .")
+                                image.push()
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        stage('Docker Manifest Build') {
+            when {
+                anyOf {
+                    branch 'master'
+                    branch 'develop'
+                }
+            }
+            agent { label 'amd64'}
+            steps {
+                script {
+                    if (BRANCH_NAME == 'master') {
+                        sh(script: "docker manifest create ${DOCKER_REPO}:${TAG} ${DOCKER_REPO}:${TAG}-amd64 ${DOCKER_REPO}:${TAG}-arm64 ${DOCKER_REPO}:${TAG}-arm")
+                        sh(script: "docker manifest inspect ${DOCKER_REPO}:${TAG}")
+                        sh(script: "docker manifest push -p ${DOCKER_REPO}:${TAG}")
+                        sh(script: "docker manifest create ${DOCKER_REPO}:latest ${DOCKER_REPO}:${TAG}-amd64 ${DOCKER_REPO}:${TAG}-arm64 ${DOCKER_REPO}:${TAG}-arm")
+                        sh(script: "docker manifest inspect ${DOCKER_REPO}:latest")
+                        sh(script: "docker manifest push -p ${DOCKER_REPO}:latest")
+                    } else if (BRANCH_NAME == 'develop') {
+                        sh(script: "docker manifest create ${DOCKER_REPO}:develop ${DOCKER_REPO}:develop-amd64 ${DOCKER_REPO}:develop-arm64 ${DOCKER_REPO}:develop-arm")
+                        sh(script: "docker manifest inspect ${DOCKER_REPO}:develop")
+                        sh(script: "docker manifest push -p ${DOCKER_REPO}:develop")
+                    }
+                }
+            }
+        }
+        stage('GitHub Release') {
+            when { branch 'master' }
+            agent { label 'amd64'}
+            steps {
+                sh """
+                    git remote set-url origin "https://${GIT_TOKEN_USR}:${GIT_TOKEN_PSW}@github.com/${GIT_REPO}.git" 
+                    git tag ${TAG}
+                    git push --tags
+                """
+            }
+        }
+    }
+}

README.md

@@ -1,8 +1,8 @@
 <p align="center">
 <img width="800" src="https://bin.cajun.pro/images/varken_full_banner.png">
 </p>
- 
-[![Build Status](https://travis-ci.org/Boerderij/Varken.svg?branch=master)](https://travis-ci.org/Boerderij/Varken)
+
+[![Build Status](https://jenkins.cajun.pro/buildStatus/icon?job=Varken/master)](https://jenkins.cajun.pro/job/Varken/job/master/)
 [![Discord](https://img.shields.io/discord/518970285773422592.svg?colorB=7289DA&label=Discord&logo=Discord&logoColor=7289DA&style=flat-square)](https://discord.gg/VjZ6qSM)
 [![BuyMeACoffee](https://img.shields.io/badge/BuyMeACoffee-Donate-ff813f.svg?logo=CoffeeScript&style=flat-square)](https://www.buymeacoffee.com/varken)
 [![Docker-Layers](https://images.microbadger.com/badges/image/boerderij/varken.svg)](https://microbadger.com/images/boerderij/varken)

Varken.py

@@ -10,7 +10,8 @@
 from argparse import ArgumentParser, RawTextHelpFormatter
 from logging import getLogger, StreamHandler, Formatter, DEBUG
 
-from varken import structures # Needed to check version of python
+# Needed to check version of python
+from varken import structures  # noqa
 from varken.ombi import OmbiAPI
 from varken.unifi import UniFiAPI
 from varken import VERSION, BRANCH
@@ -31,7 +32,6 @@ def thread():
     while schedule.jobs:
         job = QUEUE.get()
         a = job()
-        print(a)
         if a is not None:
             schedule.clear(a)
         QUEUE.task_done()

varken/__init__.py

@@ -1,2 +1,2 @@
-VERSION = "1.6.4"
+VERSION = "1.6.5"
 BRANCH = 'master'