Skip to content

refactor: restructure alpine and ubuntu build#131

Open
rwaffen wants to merge 14 commits into
mainfrom
refactor_alpine
Open

refactor: restructure alpine and ubuntu build#131
rwaffen wants to merge 14 commits into
mainfrom
refactor_alpine

Conversation

@rwaffen

@rwaffen rwaffen commented May 12, 2026 •
edited
Loading

Copy link
Copy Markdown
Member
  • restructure alpine build to make it more readable.
  • restructure ubuntu build to be build in paralell with alpine
  • remove docker-entrypoint.sh because it is deprecated since some time
  • build alpine and ubuntu in paralell and ubuntu is the default atm

fixes: #112
fixes: #88
fixes: #7

@rwaffen rwaffen force-pushed the refactor_alpine branch from 3d138a4 to 4fbb8e9 Compare May 17, 2026 22:24
@rwaffen rwaffen force-pushed the refactor_alpine branch 7 times, most recently from 8f95f69 to 6202607 Compare May 28, 2026 11:37
@github-advanced-security

github-advanced-security AI commented May 28, 2026

Copy link
Copy Markdown

You are seeing this message because GitHub Code Scanning has recently been set up for this repository, or this pull request contains the workflow file for the Code Scanning tool.

What Enabling Code Scanning Means:

  • The 'Security' tab will display more code scanning analysis results (e.g., for the default branch).
  • Depending on your configuration and choice of analysis tool, future pull requests will be annotated with code scanning analysis results.
  • You will be able to see the analysis results for the pull request's branch on this overview once the scans have completed and the checks have passed.

For more information about GitHub Code Scanning, check out the documentation.

@rwaffen rwaffen force-pushed the refactor_alpine branch 3 times, most recently from 54c35bb to 5ae56f0 Compare May 28, 2026 13:17
This was referenced May 28, 2026
Open
Open
@rwaffen rwaffen force-pushed the refactor_alpine branch from 4f9a064 to 96550cf Compare May 29, 2026 09:32
@rwaffen rwaffen marked this pull request as ready for review May 29, 2026 09:47
@rwaffen rwaffen requested a review from a team as a code owner May 29, 2026 09:47
bastelfreak
bastelfreak previously approved these changes May 29, 2026
View reviewed changes
@rwaffen rwaffen changed the title WIP refactor: restructure alpine build refactor: restructure alpine and ubuntu build May 29, 2026
@rwaffen rwaffen mentioned this pull request May 29, 2026
Open
@rwaffen rwaffen force-pushed the refactor_alpine branch from 9bf8a5e to 8893f33 Compare June 2, 2026 11:58
bastelfreak
bastelfreak reviewed Jun 2, 2026
View reviewed changes
Comment thread openvoxserver/prep_release_container.sh
bastelfreak
bastelfreak previously approved these changes Jun 2, 2026
View reviewed changes
rwaffen added 3 commits June 2, 2026 17:20
@rwaffen
refactor: restructure alpine build
bfbf316 
Signed-off-by: Robert Waffen <rw@betadots.de>
@rwaffen
fix: add software version to container meta
677a8a5 
fixes: 88

Signed-off-by: Robert Waffen <rw@betadots.de>
@rwaffen
feat: add Ubuntu back, update ci to build both
35a3552 
Signed-off-by: Robert Waffen <rw@betadots.de>
rwaffen added 4 commits June 2, 2026 17:20
@rwaffen
fix: extend build matrix with os
acf7b4e 
Signed-off-by: Robert Waffen <rw@betadots.de>
@rwaffen
ci: use better job naming
683667d 
Signed-off-by: Robert Waffen <rw@betadots.de>
@rwaffen
chore: remove dead code
28697be 
Signed-off-by: Robert Waffen <rw@betadots.de>
@rwaffen
fix: reorder chown/chmod in pre_release
b1d16a9 
Signed-off-by: Robert Waffen <rw@betadots.de>
@rwaffen rwaffen force-pushed the refactor_alpine branch from 8893f33 to b1d16a9 Compare June 2, 2026 15:21
bastelfreak
bastelfreak previously approved these changes Jun 2, 2026
View reviewed changes
@rwaffen
feat: adapt changes from #137
67a8a78 
Signed-off-by: Robert Waffen <rw@betadots.de>
@rwaffen rwaffen force-pushed the refactor_alpine branch from 1d5491a to 67a8a78 Compare June 5, 2026 14:44
miharp
miharp reviewed Jun 5, 2026
View reviewed changes
Comment thread Containerfile.alpine
MirandaStreeter
MirandaStreeter reviewed Jun 5, 2026
View reviewed changes
Comment thread Containerfile.alpine Outdated
MirandaStreeter
MirandaStreeter reviewed Jun 8, 2026
View reviewed changes
Comment thread Containerfile.alpine Outdated
MirandaStreeter
MirandaStreeter reviewed Jun 8, 2026
View reviewed changes
Comment thread openvoxserver/prep_build_container.sh
MirandaStreeter
MirandaStreeter reviewed Jun 8, 2026
View reviewed changes
Comment thread build_versions.yaml
Comment on lines -3 to -7
- release: 8
# renovate: depName=openvox-server openVoxRelease=8
server_version: "8.13.0-1+ubuntu26.04"
# renovate: depName=openvoxdb openVoxRelease=8
db_version: "8.13.0-1+ubuntu26.04"

@MirandaStreeter MirandaStreeter Jun 8, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The regex at renovate.json:25 relies on these comments for .deb auto updates (note the hash at the beginning). Do we intend to rewrite the deb customManager, or should we add these back?

@rwaffen rwaffen Jun 9, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

i'm unsure here. i want to move all versions into the Containerfile to have it in one place. renopvate can update the args/envs there too. so i moved it over.

@MirandaStreeter MirandaStreeter Jun 11, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I suppose I mean, based on what I'm seeing, renovate will not auto-bump the ubuntu containerfile dependencies any more. It will only do so for the alpine image spec. I may be misunderstanding how it detects these, though, so if this isn't a problem then feel free to move on.

rwaffen added 4 commits June 10, 2026 08:49
@rwaffen
fix: add curl for healthchecks in alpine image
ab7baca 
Signed-off-by: Robert Waffen <rw@betadots.de>
@rwaffen
fix: add set -e to not silently fail
f9ff6c7 
Signed-off-by: Robert Waffen <rw@betadots.de>
@rwaffen
chore: switch back, again, to java 25, now that we are sure we want t…
c140bf5 
…o use it already :D

Signed-off-by: Robert Waffen <rw@betadots.de>
@rwaffen
fix: switch to arg instead of env so you can overwrite it from the ou…
25364fb 
…side while building

Signed-off-by: Robert Waffen <rw@betadots.de>
bastelfreak
bastelfreak reviewed Jun 10, 2026
View reviewed changes
Comment thread build_versions.yaml Outdated
miharp
miharp reviewed Jun 10, 2026
View reviewed changes
Comment thread openvoxserver/prep_release_container.sh Outdated
rwaffen and others added 2 commits June 11, 2026 09:39
@rwaffen @miharp
Update openvoxserver/prep_release_container.sh
02ad086 
Co-authored-by: Michael Harp <mike@mikeharp.com>
Signed-off-by: Robert Waffen <rwaffen@gmail.com>
@rwaffen
chore: go to 21, 25 is "untestet", still, people are afraid.
988b812 
Signed-off-by: Robert Waffen <rw@betadots.de>
miharp
miharp approved these changes Jun 11, 2026
View reviewed changes

@miharp miharp left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

LGTM, +1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bastelfreak bastelfreak bastelfreak left review comments

@MirandaStreeter MirandaStreeter MirandaStreeter left review comments

+1 more reviewer

@miharp miharp miharp approved these changes

Reviewers whose approvals may not affect merge requirements

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

Labels

backwards-incompatible enhancement New feature or request

Projects

Container Todos
Status: No status

Milestone

No milestone

5 participants

@rwaffen @github-advanced-security @miharp @bastelfreak @MirandaStreeter