-
Notifications
You must be signed in to change notification settings - Fork 24
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.
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
[BB2-2263] local dev docker cleanup and improve #1106
Merged
JFU-GIT
merged 8 commits into
master
from
jfuqian/BB2-2263-DevLocal-Docker-Cleanup-and-Improve
Apr 25, 2023
Merged
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
b3eb577
local dev docker cleanup and improve
bd1c2fc
more refactoring and optimize the selenium test using pytest instead …
7ecac9c
added health check for service bb2slsx to overcome racing cond.
0344fe7
fix broken tests.
1b57fc7
fix linting
ae1ee87
msls healthy check
ba551ca
revert to make for installing packages
91c67ae
Merge remote-tracking branch 'origin/master' into jfuqian/BB2-2263-De…
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
more refactoring and optimize the selenium test using pytest instead …
…of Django.test
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,16 @@ | ||
FROM selenium/standalone-chrome-debug | ||
|
||
ENV PYTHONUNBUFFERED 1 | ||
USER root | ||
# libpq-dev: ubuntu dev lib for psypsycopg2 sdist build | ||
RUN apt-get update && apt-get install -yq python3.8 python3-pip git libpq-dev libffi-dev | ||
RUN mkdir /code | ||
ADD . /code/ | ||
WORKDIR /code | ||
USER root | ||
RUN apt-get update ; apt-get install -yq python3.8 python3.8-venv python3-pip git libpq-dev libffi-dev | ||
RUN ln -s /usr/bin/python3 /usr/local/bin/python | ||
RUN useradd -m -s /bin/bash DEV | ||
USER DEV | ||
ADD . /code | ||
WORKDIR /code | ||
RUN python -m venv /tmp/venv | ||
RUN . /tmp/venv/bin/activate | ||
ENV PATH="/tmp/venv/bin:${PATH}" | ||
RUN pip3 install --upgrade pip | ||
RUN pip3 install selenium | ||
RUN pip3 install pyyaml==6.0 pillow==9.3.0 newrelic==8.7.0 | ||
RUN pip3 install -r requirements/requirements.dev.txt --no-index --find-links ./vendor/ | ||
RUN pip3 install selenium pytest |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
James,
Could you please put the make call back instead of duplicating that call here? It made me go look and the makefile to see what changed and it appears that nothing changed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sure, here the pip show is for trouble shooting - will remove it
and original intention is getting rid of make by pull out the make target and pip install directly...
but I can put the make call back.