Skip to content

Commit c020e76

Browse files
Merge pull request #2 from travisghansen/next
v0.1.8
2 parents 3f43703 + 13e0b96 commit c020e76

20 files changed

+403
-91
lines changed

.env.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
# PFSENSE_USERNAME="admin"
33
# PFSENSE_PASSWORD="secret"
44
# PFSENSE_INSECURE="false"
5+
# PFSENSE_DEBUG="false"

.travis.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,31 @@
11
# if: tag IS present
22
language: php
33
php:
4-
- '7.2'
4+
- '7.3'
55
sudo: required
66
services:
77
- docker
88
install: true
99
script: true
1010
after_success:
1111
- composer buildphar
12+
1213
deploy:
1314
- provider: script
1415
script: bash .travis/docker-release.sh
1516
skip_cleanup: true
1617
on:
1718
repo: travisghansen/kubernetes-pfsense-controller
18-
branch: "master"
19+
all_branches: true
20+
condition: $TRAVIS_BRANCH =~ ^master|next$
21+
1922
- provider: script
2023
script: bash .travis/docker-release.sh
2124
skip_cleanup: true
2225
on:
2326
repo: travisghansen/kubernetes-pfsense-controller
2427
tags: true
28+
2529
- provider: releases
2630
api_key:
2731
secure: gh6irydkkZ5Q+BTfYJ9+554IfNalaCsSEAEUkcFRf8mCQltttApo7lQtoOIQFZrQhxkfJukhZBogdDJ1cYb/KJD0j5+XZx7dSHXYHqYy03KYZbWdHvhaBENDM5sxZG1QSfva9pP6x8XQDn3/5p8amUuWwCtlAWrKfh+tfdkyaeBWppzP1xxoeee4DekBaGNWSmN/+Ebvw+4XkrJDi2KnufkiWiUg4JdBIPJNWJXzXUVC2TIa7915iGFQ0wNcJHd50kXncCjFGUufBDauxa1U72jdAByy6e+yHlWXB1h0jw15UD89i+YMCHx+oJo94+DiJh/J+5RR4sEx6+Nqo8tH4CBW2C83RdMMRAy6/sUXtlFEpPRoyUXfLxIvxuNco5DdKb2Z2P+fuJFsNWVKWN/htKXtLxWD1SxjpldfmfieKhGB4xB+hJAvNRq7K4kd5IRCX9O9IWvcuy2+uybovraDqPk6oWpPCiC6wThXt5ELw48ga9WwRbtuMt+bX0jFqzQMeS8Xgcwu0WZ+VDLqixr+NPGrt+lVTvEYUADRRpT1B25N/Ssmtxut+Tk2D2U9qJ6leYzBp8KcavliG72qt/6fdi6bQ9l4rlupq2CwNaqEJW+1WyAHi759138RacVRJwIX6oi1YvYqSR7jCFhc4H7IxxPjvUPDaQmzXAfsZmgESXY=

.travis/docker-release.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ elif [[ "${TRAVIS_BRANCH}" == "master" ]];then
99
docker build --pull -t travisghansen/kubernetes-pfsense-controller:latest .
1010
docker push travisghansen/kubernetes-pfsense-controller:latest
1111
else
12-
:
12+
docker build --pull -t travisghansen/kubernetes-pfsense-controller:${TRAVIS_BRANCH} .
13+
docker push travisghansen/kubernetes-pfsense-controller:${TRAVIS_BRANCH}
1314
fi

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# v0.1.8
2+
3+
Released 2019-10-22
4+
5+
- several HAProxy fixes
6+
- introduce env variable `PFSENSE_DEBUG` to log all pfSense xmlrpc traffic
7+
- more robust logging for failure scenarios
8+
- k8s version awareness to prep for deprecations of several API endpoints

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:7.2-cli-alpine
1+
FROM php:7.3-cli-alpine
22

33
RUN \
44
apk add --no-cache bzip2-dev \

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@
1111
}
1212
],
1313
"require": {
14-
"php": ">=7.2.0",
14+
"php": ">=7.3.0",
1515
"ext-yaml": "*",
1616
"ext-pcntl": "*",
1717
"ext-json": "*",
1818
"ext-bz2": "*",
1919
"travisghansen/kubernetes-controller-php": "0.1.*",
2020
"travisghansen/kubernetes-client-php": "0.1.*",
2121
"zendframework/zend-xmlrpc": "^2.7",
22-
"vlucas/phpdotenv": "^2.5"
22+
"vlucas/phpdotenv": "^2.5",
23+
"composer/semver": "^1.5"
2324
},
2425
"autoload": {
2526
"psr-0": {"KubernetesPfSenseController\\": "src/"}

0 commit comments

Comments
 (0)