Skip to content
This repository was archived by the owner on Feb 15, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ 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
RUN yum install python3-pip wget

RUN pip install --upgrade pip \
&& pip install --upgrade pipenv\
&& pipenv install --system --deploy --ignore-pipfile
&& pip install --upgrade -r /tmp/requirements.txt

USER 1001

Expand Down
5 changes: 2 additions & 3 deletions Dockerfile-tools
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 All @@ -12,8 +12,7 @@ RUN yum -y install --disableplugin=subscription-manager python36 \
RUN yum -y install --disableplugin=subscription-manager python3-pip wget \
&& yum --disableplugin=subscription-manager clean all

RUN pip3 install pipenv
RUN pipenv install --system --deploy --ignore-pipfile
RUN pip3 install --upgrade -r /tmp/requirements.txt

# Update python command to point to python3 install
RUN alternatives --set python /usr/bin/python3
Expand Down
18 changes: 9 additions & 9 deletions Pipfile
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[[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 = "*"
Flask = ">=1.0.0"
prometheus_client = "*"

[requires]
python_version = ">=3"
prometheus-client = "*"
160 changes: 0 additions & 160 deletions Pipfile.lock

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ To get started building this application locally, you can either run the applica
Running Flask applications has been simplified with a `manage.py` file to avoid dealing with configuring environment variables to run your app. From your project root, you can download the project dependencies with:

```bash
pipenv install --system --deploy --ignore-pipfile
pip install -r requirements.txt
```

To run your application locally:
Expand Down
5 changes: 5 additions & 0 deletions requirements.txt
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