Skip to content
This repository has been archived by the owner on Oct 3, 2020. It is now read-only.

Commit

Permalink
Update dependencies (#163)
Browse files Browse the repository at this point in the history
* update dependencies

* fix kubeconfig loader

* use pipenv

* add missing pipenv shell

* tox-pipenv

* pipenv on Travis

* add cache files to gitignore
  • Loading branch information
hjacobs committed May 1, 2018
1 parent 74bf801 commit 07df4e8
Show file tree
Hide file tree
Showing 13 changed files with 8,430 additions and 2,082 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ dist/
scm-source.json
.cache/
.coverage
.pytest_cache/
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: python
python:
- "3.5"
- "3.6"
install:
- pip install tox tox-travis coveralls
- nvm install 7.4
Expand Down
12 changes: 7 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
FROM alpine:3.6
FROM alpine:3.7
MAINTAINER Henning Jacobs <[email protected]>

EXPOSE 8080

RUN apk add --no-cache python3 python3-dev gcc musl-dev zlib-dev libffi-dev openssl-dev ca-certificates && \
python3 -m ensurepip && \
rm -r /usr/lib/python*/ensurepip && \
pip3 install --upgrade pip setuptools gevent && \
pip3 install --upgrade pipenv gevent && \
apk del python3-dev gcc musl-dev zlib-dev libffi-dev openssl-dev && \
rm -rf /var/cache/apk/* /root/.cache /tmp/*

COPY scm-source.json /

COPY requirements.txt /
RUN pip3 install -r /requirements.txt
COPY Pipfile /
COPY Pipfile.lock /

WORKDIR /
RUN pipenv install --system --deploy --ignore-pipfile

COPY kube_ops_view /kube_ops_view

ARG VERSION=dev
RUN sed -i "s/__version__ = .*/__version__ = '${VERSION}'/" /kube_ops_view/__init__.py

WORKDIR /
ENTRYPOINT ["/usr/bin/python3", "-m", "kube_ops_view"]
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ test:
tox

appjs:
docker run $(TTYFLAGS) -u $$(id -u) -v $$(pwd):/workdir -w /workdir/app node:8.4-alpine npm install
docker run $(TTYFLAGS) -u $$(id -u) -v $$(pwd):/workdir -w /workdir/app node:8.4-alpine npm run build
docker run $(TTYFLAGS) -u $$(id -u) -v $$(pwd):/workdir -w /workdir/app node:9.11-alpine npm install
docker run $(TTYFLAGS) -u $$(id -u) -v $$(pwd):/workdir -w /workdir/app node:9.11-alpine npm run build

docker: appjs scm-source.json
docker build --build-arg "VERSION=$(VERSION)" -t "$(IMAGE):$(TAG)" .
Expand Down
30 changes: 30 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
[[source]]

url = "https://pypi.org/simple"
verify_ssl = true
name = "pypi"


[packages]

click = "*"
gevent = "*"
requests = "*"
stups-tokens = ">=1.1.19"
redlock-py = "*"
json-delta = ">=2.0"
kubernetes = "*"
flask = "*"
flask-oauthlib = "*"


[dev-packages]

"flake8" = "*"
pytest = "*"
pipenv = "*"


[requires]

python_version = "3.6"
Loading

0 comments on commit 07df4e8

Please sign in to comment.