-
-
Notifications
You must be signed in to change notification settings - Fork 3k
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
Added Proper Docker Compose and .env.docker-setup files #14724
base: develop
Are you sure you want to change the base?
Conversation
💖 Thanks for this pull request! 💖 We use semantic commit messages to streamline the release process and easily generate changelogs between versions. Before your pull request can be merged, you should update your pull request title to start with a semantic prefix if it doesn't have one already. Examples of commit messages with semantic prefixes:
Things that will help get your PR across the finish line:
We get a lot of pull requests on this repo, so please be patient and we will get back to you as soon as we can. |
PR Summary
|
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.
This looks AWESOME. Since we're so close to v7, I think I'm going to look at merging this once we do the v7->develop merge. If you want to get in front of that, you can definitely re-target to the snipeit_v7_laravel10
branch. But if you don't, I'm going to take it anyway - because this looks great and what I was hoping for. Thank you!
Thankies for the compliments. ^^ |
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.
This looks great, but for the CIDR comment i made.
@@ -91,7 +96,7 @@ API_TOKEN_EXPIRATION_YEARS=40 | |||
# -------------------------------------------- | |||
# OPTIONAL: SECURITY HEADER SETTINGS | |||
# -------------------------------------------- | |||
APP_TRUSTED_PROXIES=192.168.1.1,10.0.0.1 | |||
APP_TRUSTED_PROXIES=192.168.1.1,10.0.0.1,172.0.0.0/8 |
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.
This should be 172.16.0.0/12.... not all 172 addresses are private 😉
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.
Should we also change the 192.168 and 10 blocks to full CIDR ranges as well?
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.
This should be 172.16.0.0/12.... not all 172 addresses are private 😉
Docker uses a /8 Network tho.
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.
Should we also change the 192.168 and 10 blocks to full CIDR ranges as well?
To this day I still don't know if Docker uses 172/8 or 192.168/12 at work we had issues with the second range colliding with existing networks, which was strange to see, cause to that point I always thought they used the first one (172/8)
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.
I rather wish to have the underlying hostname issue fixed, rather opening up that big of a range. But I am unsure if that is possible.
Description
For a while now @svpernova09 and I have been planning on rewriting the Docker Docs so it uses Docker compose, instead of Docker run. That requires us to change some stuff in the repo. Like having a
docker-compose.yml
and.env.docker
file which can be used by the user.This Pr should help with getting less support inquiries in the Discord Docker channel and remove
docker run
from production deployments.Thankies to @svpernova09 for helping me brainstorm about possible solutions and providing the health checks for the
docker-compose.yml
Type of change
How Has This Been Tested?
The updated article can be read in the docs.
But I tested my setup, by running the following commands.
.env.docker
to.env
.env
, if neededdocker compose up -d
and wait for startupdocker compose down
to remove deployment, but not the volumesdocker compose up -d
and wait for startupdocker compose down -v
delete deployment and dataChecklist: