Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIX][GWELLS-2226] fix docker compose is generating an error in local #2227

Merged
merged 8 commits into from
May 14, 2024
Merged

[FIX][GWELLS-2226] fix docker compose is generating an error in local #2227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
89e642c
modified backend-command-script to address error when bulding containers
acatchpole May 13, 2024
974ecbe
removed package from package-lock (remnant from old ticket)
acatchpole May 13, 2024
942f68c
commit to trigger jenkins
acatchpole May 13, 2024
9322f35
Adjust assemble script to upgrade pip by pulling pip binary.
May 14, 2024
962450b
Upgrade binary reference for python 3.6.
May 14, 2024
b9e5e24
Add the pinned dependency.
May 14, 2024
da49c96
Update flag.
May 14, 2024
2b96e48
Remove user flag.
May 14, 2024
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ app/backend/bulk
*.spec
pip-log.txt
pip-delete-this-directory.txt
app/backend/get-pip.py

# Unit test / coverage reports
htmlcov/
Expand Down
4 changes: 3 additions & 1 deletion app/.s2i/bin/assemble
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ mv /tmp/src/* ./

if [[ ! -z "$UPGRADE_PIP_TO_LATEST" || ! -z "$ENABLE_PIPENV" ]]; then
echo "---> Upgrading pip to latest version ..."
pip install -U pip setuptools==57.4.0 wheel
curl -s -o get-pip.py https://bootstrap.pypa.io/pip/3.6/get-pip.py && python3 get-pip.py
python3 -m pip install -U setuptools==57.4.0 wheel
rm get-pip.py
fi

cd backend
Expand Down
5 changes: 0 additions & 5 deletions app/frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions app/scripts/backend-command-script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ if [ "$ENVIRONMENT" = "local" ]; then
set -x &&
cd /app/backend &&
mkdir -p .pip &&
curl -s -o get-pip.py https://bootstrap.pypa.io/pip/3.5/get-pip.py && python3 get-pip.py &&
python3 -m pip install --upgrade pip &&
python3 -m pip install ptvsd &&
python3 -m pip install --cache-dir=.pip -r requirements.txt &&
Expand Down
Loading