Skip to content
This repository was archived by the owner on Feb 15, 2023. It is now read-only.

fix: sync with master #29

Merged
merged 9 commits into from
Jan 29, 2020
Merged

fix: sync with master #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
960e2fe
Merge pull request #21 from IBM/development
ChuckCox Jan 27, 2020
71eed04
Revert "chore: remove dupe dependency file"
ChuckCox Jan 27, 2020
d210de1
Merge pull request #22 from IBM/revert-21-development
youming-lin Jan 27, 2020
80d2b99
Merge pull request #24 from IBM/development
jmeis Jan 28, 2020
52df0ad
merge: pipfile
nfstein Jan 28, 2020
5e58719
hotfix: remove 'HEAD'
nfstein Jan 28, 2020
78b4c48
Merge pull request #26 from IBM/temp-stage1
jmeis Jan 28, 2020
3c67185
Merge pull request #27 from IBM/development
jmeis Jan 28, 2020
cc11b72
Merge pull request #28 from IBM/stage1
jmeis Jan 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM registry.access.redhat.com/ubi8/python-36

WORKDIR /app

COPY Pipfile* /app/
COPY requirements.txt /tmp/requirements.txt

## NOTE - rhel enforces user container permissions stronger ##
USER root
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-tools
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM registry.access.redhat.com/ubi8/ubi

WORKDIR /app

COPY Pipfile* /app/
COPY requirements.txt /tmp/requirements.txt

# Install python3
RUN yum -y install --disableplugin=subscription-manager python36 \
Expand Down
10 changes: 8 additions & 2 deletions Pipfile
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
[[source]]
name = "pypi"
url = "https://pypi.org/simple"

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


[dev-packages]


[packages]
livereload ='*'
ibmcloudenv ='~=0.0'
flask = ">=1.0.0"
gunicorn = "==19.7.1"
ibmcloudenv = "*"
livereload = "*"
Expand Down
5 changes: 5 additions & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Flask>=1.0.0
gunicorn==19.7.1
prometheus-client
ibmcloudenv
livereload