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

[BB2-2263] local dev docker cleanup and improve #1106

Merged
merged 8 commits into from
Apr 25, 2023
Merged

[BB2-2263] local dev docker cleanup and improve #1106

Show file tree
Hide file tree
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
Apr 17, 2023
bd1c2fc
more refactoring and optimize the selenium test using pytest instead …
Apr 19, 2023
7ecac9c
added health check for service bb2slsx to overcome racing cond.
Apr 19, 2023
0344fe7
fix broken tests.
Apr 20, 2023
1b57fc7
fix linting
Apr 20, 2023
ae1ee87
msls healthy check
Apr 20, 2023
ba551ca
revert to make for installing packages
Apr 20, 2023
91c67ae
Merge remote-tracking branch 'origin/master' into jfuqian/BB2-2263-De…
Apr 20, 2023
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
Next Next commit
local dev docker cleanup and improve
  • Loading branch information
JAMES FUQIAN committed Apr 17, 2023
commit b3eb5771599f7b110420c739d23a4f6e2bba3095
4 changes: 3 additions & 1 deletion .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@ SUPER_USER_NAME=root
SUPER_USER_PASSWORD=blue123
[email protected]
## DB image migrations
DB_MIGRATIONS=true
DB_MIGRATIONS=true
## put a place holder Django secret
DJANGO_SECRET_KEY=replace-me-with-real-secret
11 changes: 8 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
FROM python:3.7.13
ENV PYTHONUNBUFFERED 1
# ENV PYTHONDEVMODE 1
RUN mkdir /code
ADD . /code/
# RUN mkdir /code
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 pip install --upgrade pip
RUN pip install pip-tools
RUN make reqs-install-dev
RUN pip install -r ./requirements/requirements.dev.txt --no-index --find-links ./vendor/
Copy link
Contributor

@ajshred ajshred Apr 20, 2023 •
edited
Loading

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.

Copy link
Contributor Author

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.