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

Dockerize Junction #749

Merged
merged 9 commits into from
Apr 24, 2023
Merged

Dockerize Junction #749

merged 9 commits into from
Apr 24, 2023

Conversation

inovizz
Copy link
Contributor

@inovizz inovizz commented Apr 9, 2023 •
edited

Fixes #750

@inovizz inovizz marked this pull request as draft April 9, 2023 09:33
@inovizz inovizz force-pushed the feature/dockerize-junction branch from 519901f to 38ef495 Compare April 9, 2023 09:40
@inovizz inovizz changed the title Initial commit for Dockerization [WIP] Initial commit for Dockerization Apr 9, 2023
@inovizz inovizz changed the title [WIP] Initial commit for Dockerization [WIP] Dockerize Junction Apr 9, 2023
ananyo2012
ananyo2012 reviewed Apr 12, 2023
View reviewed changes
Copy link
Contributor

@ananyo2012 ananyo2012 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@inovizz Let's move out the warning fixes in a separate PR just to keep things easier to review.

Sc0rpi0n101
Sc0rpi0n101 reviewed Apr 12, 2023
View reviewed changes
Copy link
Member

@Sc0rpi0n101 Sc0rpi0n101 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should have .env in gitignore, not adding it to the repo.

We can add a .env.sample to help people in the case.

@inovizz
Copy link
Contributor Author

inovizz commented Apr 12, 2023

@inovizz Let's move out the warning fixes in a separate PR just to keep things easier to review.

Yes, will remove the unnecessary code.

@inovizz
Copy link
Contributor Author

inovizz commented Apr 12, 2023

I think we should have .env in gitignore, not adding it to the repo.

We can add a .env.sample to help people in the case.

Sure, will do it. Thanks.

ananyo2012
ananyo2012 reviewed Apr 14, 2023
View reviewed changes
Copy link
Contributor

@ananyo2012 ananyo2012 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left few comments

docker-compose.test.yml Outdated Show resolved Hide resolved
docker-compose.yml Outdated Show resolved Hide resolved
ananyo2012
ananyo2012 reviewed Apr 14, 2023
View reviewed changes
docker-compose.yml Outdated Show resolved Hide resolved
@realslimshanky
Copy link
Member

Docker setup works fine for me. Moving forward with functional and code review.

realslimshanky
realslimshanky reviewed Apr 16, 2023
View reviewed changes
Copy link
Member

@realslimshanky realslimshanky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've more ideas but let's merge this first and make junction functional first.

.env Outdated Show resolved Hide resolved
Dockerfile Outdated Show resolved Hide resolved
Dockerfile Show resolved Hide resolved
Dockerfile.celery Outdated Show resolved Hide resolved
docker-compose.test.yml Outdated Show resolved Hide resolved
settings/common.py Outdated Show resolved Hide resolved
settings/common.py Outdated Show resolved Hide resolved
settings/common.py Outdated Show resolved Hide resolved
settings/common.py Outdated Show resolved Hide resolved
.env Outdated Show resolved Hide resolved
@inovizz
Copy link
Contributor Author

inovizz commented Apr 18, 2023 •
edited

@inovizz Let's move out the warning fixes in a separate PR just to keep things easier to review.

Looks like I don't have a lot of time to move this to a separate PR now, so we'll go as is. The fixes are any ways similar so shouldn't be a lot of effort to review.

@inovizz
Copy link
Contributor Author

inovizz commented Apr 18, 2023

I've fixed a few things @realslimshanky @ananyo2012 & @Sc0rpi0n101. Can you have a glance once again?

Since I don't have a lot of bandwidth to contribute this week, I propose to merge the current working setup and we can request other volunteers to contribute on pending issues -

  • gunicorn setup
  • functional tests
  • Fix the CI pipeline, we could switch to Github actions or Fix Travis

@inovizz inovizz self-assigned this Apr 18, 2023
@inovizz inovizz marked this pull request as ready for review April 18, 2023 05:33
@inovizz inovizz changed the title [WIP] Dockerize Junction Dockerize Junction Apr 18, 2023
Sc0rpi0n101
Sc0rpi0n101 reviewed Apr 18, 2023
View reviewed changes
Copy link
Member

@Sc0rpi0n101 Sc0rpi0n101 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a few comments. Otherwise, Looks fine to me.

We can merge this for now and fix the other stuff in other PRs.

settings/common.py Outdated Show resolved Hide resolved
docker-compose.yml Outdated Show resolved Hide resolved
mohit-ess
mohit-ess reviewed Apr 18, 2023
View reviewed changes
wait-for-it.sh Outdated Show resolved Hide resolved
This was referenced Apr 18, 2023
Open
Closed
Closed
realslimshanky
realslimshanky reviewed Apr 20, 2023
View reviewed changes
Copy link
Member

@realslimshanky realslimshanky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rest LGTM.

Dockerfile Outdated Show resolved Hide resolved
docker-compose.yml Outdated Show resolved Hide resolved
@miphilomath
Copy link

On attempting to login via home page, I am getting the following error.
image

Though If I login through admin site first, I am logged into the application with no error.

Is anyone else facing similar problem?

@inovizz inovizz mentioned this pull request Apr 21, 2023
Closed
@ananyo2012
Copy link
Contributor

@miphilomath Can we continue conversation in this issue - #750 ?

@inovizz inovizz merged commit 9caf34e into pythonindia:feature/upgrade-junction Apr 24, 2023
ananyo2012 added a commit that referenced this pull request Jun 15, 2023
@ananyo2012 @Bhandari423
@inovizz @RajatRajdeep
Upgrade to Django 3.2 LTS and Dockerize junction (#757)
c4d8ba3 
* Upgrade Junction to Python 3.10 & Django 3.2 along with Social Login Fix (#744)

* Upgrade Python Version to 3.10 and Django Version 3.2

* Fix Github and Google Login/Signup

* new package added to the requirements file

* using f-strings

Co-authored-by: @rohitchopra-epam

* Fix unit tests add gunicorn (#748)

* Fix failing tests, Add gunicorn

Added nox method for running gunicorn

* Pin dependencies

---------

Co-authored-by: Ananya Maiti <Ananya_Maiti@epam.com>

* Dockerize Junction (#749)

* Initial commit for Dockerization

* Fix review comments and dockerignore

* Update dev.py.sample with runsslserver

* Fixes for using default settings module

* Remove Dockerfile.celery and use image from junction web image

* Update docker-compose.test.yml to not depend on postgres db

* Add static asset compilation in Docker image

* Add docker-compose.prod.yml and update server port configuration in application

* Add social oauth env vars

---------

Co-authored-by: Sanchit Balchandani <balchandani.sanchit@gmail.com>
Co-authored-by: Ananya Maiti <Ananya_Maiti@epam.com>

* Add SITE_PREFIX env variable for site url prefix

* Fix smtp setup for sending verification emails

* Fix conference moderator filter

* Fix template params fro absolute_url and is_proposal_reviewer

* Add Django streamhandler logging with DEBUG (#763)

* Fix proposal comment template parameters

Fix userprofile dashboard url

* Add restart:always to containers

* Fix comment creation error caused sparingly

Add review_comments=False for default comment view for logged in user

* Add password for Redis DB

* Fixes #765

Sort ProposalSection in descending order of creation date
in ProposalSectionReviewer Add form

* Add autocomplete_field for Proposal Reviewer to enable searcheable dropdown in add form

* Update DEFAULT_FROM_EMAIL

* Update common.py

* Added username field in edit profile form (Issue-769) (#771)

Co-authored-by: Rajat Rajdeep <rajat.rajdeep@avasant.com>

* Update Devlopment setup docs (#773)

* Update Devlopment setup docs

* Instructions for setting up junction using Docker post junction upgrade. (#761)

* Added instructions in the ReadMe file for setting up junction using Docker post junction upgrade.

* Updated the psycopg version to resolve - SCRAM authentication requires libpq version 10 issue.

---------

Co-authored-by: Rajat Rajdeep <rajat.rajdeep@avasant.com>

---------

Co-authored-by: Ananya Maiti <Ananya_Maiti@epam.com>
Co-authored-by: Rajat Rajdeep <46029666+RajatRajdeep@users.noreply.github.com>
Co-authored-by: Rajat Rajdeep <rajat.rajdeep@avasant.com>

* Rename travis yml

* Remove status badges from README

---------

Co-authored-by: Bhandari423 <69859505+Bhandari423@users.noreply.github.com>
Co-authored-by: Ananya Maiti <Ananya_Maiti@epam.com>
Co-authored-by: Sanchit Balchandani <balchandani.sanchit@gmail.com>
Co-authored-by: Rajat Rajdeep <46029666+RajatRajdeep@users.noreply.github.com>
Co-authored-by: Rajat Rajdeep <rajat.rajdeep@avasant.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@realslimshanky realslimshanky realslimshanky left review comments

@ananyo2012 ananyo2012 ananyo2012 left review comments

@Sc0rpi0n101 Sc0rpi0n101 Sc0rpi0n101 left review comments

@mohit-ess mohit-ess mohit-ess left review comments

Assignees

@inovizz inovizz

Labels
area/tooling
Projects
No open projects
PyCon India 2023 Task Board
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@inovizz @realslimshanky @miphilomath @ananyo2012 @Sc0rpi0n101 @mohit-ess @sanchitcentrica