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

ballistica in docker :o #698

Merged
merged 12 commits into from
May 18, 2024
Merged

Conversation

Loup-Garou911XD
Copy link
Contributor

@Loup-Garou911XD Loup-Garou911XD commented May 16, 2024

Steps

  • Write a good description of what your PR does (and WHY it does it).
  • Add yourself to CONTRIBUTORS if you are a new contributor.
  • Add a CHANGELOG entry if your change is non-trivial.
  • Ensure make preflight completes successfully.

Description

Added build system for docker which builds docker image with bombsquad server which could be deployed easily with docker on any system
Added docker-build and docker-run targets to make file

Type of Changes

Type
✨ New feature

@MW2917
Copy link
Contributor

MW2917 commented May 16, 2024

so I have to write my fix into changelog with PR?

@Loup-Garou911XD
Copy link
Contributor Author

so I have to write my fix into changelog with PR?

yeah u should

@Loup-Garou911XD Loup-Garou911XD marked this pull request as ready for review May 18, 2024 15:07
@Loup-Garou911XD
Copy link
Contributor Author

@efroemling https://github.com/efroemling/ballistica/actions/runs/9140752345/job/25134432953?pr=698#step:5:23
what to do bout this?
i checked tools/batools/spinoff/_context.py and it doesn't have the sphinx dir anymore so idk

@efroemling
Copy link
Owner

@efroemling https://github.com/efroemling/ballistica/actions/runs/9140752345/job/25134432953?pr=698#step:5:23 what to do bout this? i checked tools/batools/spinoff/_context.py and it doesn't have the sphinx dir anymore so idk

The src/assets dir is a bit of a complicated beast as far as spinoff rules and things like that. Can you stick the Dockerfile in config/docker/Dockerfile? I think that may fix (or least improve) things.

@Loup-Garou911XD
Copy link
Contributor Author

@efroemling https://github.com/efroemling/ballistica/actions/runs/9140752345/job/25134432953?pr=698#step:5:23 what to do bout this? i checked tools/batools/spinoff/_context.py and it doesn't have the sphinx dir anymore so idk

The src/assets dir is a bit of a complicated beast as far as spinoff rules and things like that. Can you stick the Dockerfile in config/docker/Dockerfile? I think that may fix (or least improve) things.

Okay sure just gimme few minutes I'll push

@Loup-Garou911XD
Copy link
Contributor Author

Loup-Garou911XD commented May 18, 2024

Also @vishal332008 requests you to come on discord

@efroemling
Copy link
Owner

@efroemling https://github.com/efroemling/ballistica/actions/runs/9140752345/job/25134432953?pr=698#step:5:23 what to do bout this? i checked tools/batools/spinoff/_context.py and it doesn't have the sphinx dir anymore so idk

The src/assets dir is a bit of a complicated beast as far as spinoff rules and things like that. Can you stick the Dockerfile in config/docker/Dockerfile? I think that may fix (or least improve) things.

Okay sure just gimme few minutes I'll push

If it's still giving you errors after that, don't worry about it; I can fix the spinoff stuff on my end after I pull the PR if that's the case.

@efroemling
Copy link
Owner

Also @vishal332008 asks you to come on discord

Also just as an FYI: the error I was seeing is that spinoff didn't know whether or not to filter the Dockerfile. Check out config/spinoffconfig.py line 142 for where it determines that. If you relocate Dockerfile to under config/docker/ then it will be covered by one of those rules (we do want it to be filtered I think).

@Loup-Garou911XD
Copy link
Contributor Author

Also @vishal332008 asks you to come on discord

Also just as an FYI: the error I was seeing is that spinoff didn't know whether or not to filter the Dockerfile. Check out config/spinoffconfig.py line 142 for where it determines that. If you relocate Dockerfile to under config/docker/ then it will be covered by one of those rules (we do want it to be filtered I think).

filtered means not included in spinoff project?

@efroemling
Copy link
Owner

Thanks for this!

@efroemling efroemling merged commit cfdab74 into efroemling:master May 18, 2024
16 checks passed
@efroemling
Copy link
Owner

Also @vishal332008 asks you to come on discord

Also just as an FYI: the error I was seeing is that spinoff didn't know whether or not to filter the Dockerfile. Check out config/spinoffconfig.py line 142 for where it determines that. If you relocate Dockerfile to under config/docker/ then it will be covered by one of those rules (we do want it to be filtered I think).

filtered means not included in spinoff project?

No; filtered just means that all instances of 'BallisticaKit' in the file are replaced with 'BombSquad' (or whatever else the project name is), and optionally other filtering is done too. Generally we want this for most things.

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.

None yet

3 participants