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.

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

Containerize GH #2

Merged
merged 4 commits into from
Dec 14, 2020
Merged

Containerize GH #2

merged 4 commits into from
Dec 14, 2020

Conversation

egfrank
Copy link
Contributor

@egfrank egfrank commented Dec 10, 2020

PR for issue #1

I had to add dependencies for fullctl, arouteserver, and postgres so I pushed up a new pipenv and pipenv.lock. Let me know if any of those are erroneous- I didn't see arouteserver in the codebase but it was in the readme so I added it.

Again, if you're having any database trouble specifically I would just wait for the postgres db to initialize and then do
Ctl/dev/compose.sh down

and then
Ctl/dev/compose.sh up
and see if that fixes it. Additionally, if you're having a db error that seems incorrect (like saying that the database is configured incorrectly) you can just remove the /postgres_data file and re-initialize.

max-size: 100m
max-file: "3"
volumes:
- ../../postgres_data:/var/lib/postgresql/data
Copy link
Contributor

Choose a reason for hiding this comment

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

Lets have this go to the Ctl/dev dir (see the changes i made to docker-compose in ixctl)

Copy link
Contributor

Choose a reason for hiding this comment

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

Oh also can you add it to .dockerignore file so rebuilding the container doesn`t try to grab it (can just copy the one from the ixctl repo as is)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for the feedback, this should be fixed in the latest changes.

build:
context: ../..
dockerfile: Dockerfile
command: "runserver 0.0.0.0:${DJANGO_PORT:-8080}"
Copy link
Contributor

Choose a reason for hiding this comment

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

The internal port can always be 8000 - or at least we should give it a separate env var to override it, i think

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Also fixed in the latest changes!

command: "runserver 0.0.0.0:${DJANGO_PORT:-8080}"
env_file: .env
ports:
- "${DJANGO_PORT:-8080}:8080"
Copy link
Contributor

Choose a reason for hiding this comment

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

Lets default to 8000

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Addressed in the latest changes!

Pipfile Outdated
@@ -23,8 +25,10 @@ grainy = ">=1.5.0,<2"
django-grainy = ">=1.8.0,<2"
pyyaml = "*"
pip = "*"
arouteserver = "*"
Copy link
Contributor

Choose a reason for hiding this comment

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

Won`t be using arouteserver in devicectl, can drop it

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Okay thanks for letting me know, I removed arouteserver from the pipfile, the pipfile.lock, and the docs

@vegu
Copy link
Contributor

vegu commented Dec 11, 2020

@egfrank that looks mostly good, some changes we`d want to make to the compose file (see comments)

And the arouteserver bit was left over from when i copied from ixctl, devicectl wont be using it so can remove from pipfile and the docs please 👍

@vegu vegu merged commit 63ccdb8 into master Dec 14, 2020
@vegu
Copy link
Contributor

vegu commented Dec 14, 2020

@egfrank looks good now, merged

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants