Skip to content

Commit

Permalink
Merge pull request #16 from gyselroth/dev
Browse files Browse the repository at this point in the history
fixes latest tagging / no build in docker image itself
  • Loading branch information
raffis committed Mar 11, 2019
2 parents fbbeeee + e47fdbb commit c91b700
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 11 deletions.
7 changes: 5 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
.editorconfig
build
node_modules
coverage
tests
data
src
tsconfig.json
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
build
coverage
data
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ after_success:
- test "$TRAVIS_TAG" != "" && version=${TRAVIS_TAG:1};
- test "$TRAVIS_TAG" != "" && docker build -t gyselroth/kube-icinga:$version .
- test "$TRAVIS_TAG" != "" && docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"
- test "$TRAVIS_TAG" != "" && docker tag gyselroth/kube-icinga:$version gyselroth/kube-ldap:latest
- test "$TRAVIS_TAG" != "" && docker tag gyselroth/kube-icinga:$version
- test "$TRAVIS_TAG" != "" && docker tag gyselroth/kube-ldap:latest
- test "$TRAVIS_TAG" != "" && docker push gyselroth/kube-icinga:$version
- test "$TRAVIS_TAG" != "" && docker push gyselroth/kube-icinga:latest
7 changes: 0 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
FROM node:10.15.1-alpine

RUN apk update && apk add git

COPY . /opt/kube-icinga
RUN cd /opt/kube-icinga && \
npm install && \
npm run build

CMD ["node", "/opt/kube-icinga/build/main.js"]
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kube-icinga",
"version": "2.0.0",
"version": "2.0.1",
"description": "Icinga2 autodiscovery service for kubernetes",
"main": "main.js",
"scripts": {
Expand Down

0 comments on commit c91b700

Please sign in to comment.