Commit Graph

113 Commits

Author SHA1 Message Date
Michiel Hazelhof
a527d425fd Improve naming 2025-08-12 16:15:51 +02:00
Michiel Hazelhof
f9055c711a Better detect running patched containers 2025-08-12 16:13:11 +02:00
Michiel Hazelhof
1871df136b Merge branch 'unified' into unified 2025-08-12 15:51:22 +02:00
Michiel Hazelhof
fe7ac2131e Add missing parameter 2025-08-12 15:47:20 +02:00
Michiel Hazelhof
874ff182c6 Properly detect previous version 2025-08-12 15:45:54 +02:00
Michiel Hazelhof
b75dfb2512 Fix circleci 2025-08-12 15:42:52 +02:00
Michiel Hazelhof
232de042dd Fix type 2025-08-12 15:37:06 +02:00
Michiel Hazelhof
b12b470656 Cleanup circleci 2025-08-12 15:32:59 +02:00
Michiel Hazelhof
d07f030d9a Fix comparator 2025-08-12 15:32:49 +02:00
Michiel Hazelhof
1ee45a327f Fix path issue 2025-08-12 15:30:35 +02:00
Michiel Hazelhof
ab8eed492c Cleanup 2025-08-12 15:23:49 +02:00
Michiel Hazelhof
7203354204 Upgrade dnlib 2025-08-12 15:18:46 +02:00
Michiel Hazelhof
9ca720af8c Remove NewtonSoft.Json 2025-08-12 15:16:59 +02:00
Michiel Hazelhof
6ba14a7134 Cleanup 2025-08-12 15:15:31 +02:00
Michiel Hazelhof
d8098cb560 Cleanup 2025-08-12 15:03:54 +02:00
Michiel Hazelhof
c72fbf5b1c Reuse code 2025-08-12 15:03:48 +02:00
Michiel Hazelhof
0b0512570f Clarify language 2025-08-12 15:02:49 +02:00
Michiel Hazelhof
dfc364e7f3 Simplify call 2025-08-12 15:02:30 +02:00
Michiel Hazelhof
48c67fc66e Make call consistent 2025-08-12 15:02:21 +02:00
Michiel Hazelhof
80fcf0cfc6 Copy files only when needed 2025-08-12 15:01:57 +02:00
Michiel Hazelhof
e87bc81a9c Copy all files 2025-08-12 15:01:26 +02:00
Michiel Hazelhof
93cae61d66 Refactor and fixes 2025-08-12 13:42:08 +02:00
Michiel Hazelhof
52fabd9a95 Cleanup code 2025-08-12 13:11:12 +02:00
Michiel Hazelhof
ddf67ec706 Cleanup code 2025-08-12 12:35:54 +02:00
Michiel Hazelhof
7786c4406c Cleanup code 2025-08-12 12:18:28 +02:00
Michiel Hazelhof
f360f54e46 Update class path 2025-08-12 12:10:31 +02:00
Michiel Hazelhof
273ac7b4eb Fix ps1 script and update language 2025-08-12 12:09:48 +02:00
Michiel Hazelhof
d34041c1e3 Test generating user and organization licenses during build check (#252) 2025-08-05 12:05:05 +02:00
Michiel Hazelhof
de61195d19 Fix license generator according to upstream changes (#245) (#249) 2025-08-05 12:03:30 +02:00
juliokele
29add24126 licenseGen: fix OrganizationLicense namespace (#253)
Co-authored-by: juliokele <>
2025-08-03 18:11:30 +02:00
Joseph Gigantino
3689cc5ba1 Test generating user and organization licenses during build check (#251)
Add commands to build check to test if the created licensegen image can actually generate user and organization licenses. licenseGen.sh will print the generated license to stdout and return zero if successful. If an error occurs, a non zero error code is returned which should cause a build error.
2025-07-30 19:51:51 +02:00
Joseph Gigantino
34da077778 Update Program.cs (#241)
Remove duplicate instances of:
Set("UseRiskInsights", true);
Set("UseOrganizationDomains", true);     Set("UseAdminSponsoredFamilies", true);

Signed-off-by: Joseph Gigantino <128943406+Jgigantino31@users.noreply.github.com>
Co-authored-by: h44z <christoph.h@sprinternet.at>
2025-07-29 19:54:54 +02:00
juliokele
a3803cb3bc [unified] Fix licenseGen according to upstream changes (#247)
* Dockerfile: remove not existing executable argument

* licenseGen: fix classes according to upstream changes

---------

Co-authored-by: juliokele <>
2025-07-29 19:49:52 +02:00
juliokele
01cdfa2842 [unified] Fix patch according to upstream changes and fix build errors (#243)
* Fix bitbetter patch according to upstream changes

* Fix the builds by removing redundant already removed and stopped old instance

---------

Co-authored-by: juliokele <>
2025-07-29 19:48:55 +02:00
Michiel Hazelhof
076b0a624b Upstream patches (#240) 2025-07-15 10:00:09 +01:00
Michiel Hazelhof
a97f6f3e49 Upstream patches 2025-07-15 10:52:18 +02:00
Joseph Gigantino
3d4c10d6f6 Update Program.cs (#236)
Set three new license options to true: UseRiskInsights, UseOrganizationDomains, and UseAdminSponsoredFamilies.

As mentioned in #229, licenses had to be regenerated starting in 2025.5.0. It looks like new options were added which default to false unless we set them to true here. I am not sure if the version needs to be bumped or not. I tested locally and I can now access the Claimed Domains page in my organization.

Signed-off-by: Joseph Gigantino <128943406+Jgigantino31@users.noreply.github.com>
2025-06-25 12:40:00 +00:00
Joseph Gigantino
1597800b89 Update serverlist.txt so that by default all lines are comments (#228) 2025-06-25 12:34:10 +00:00
juliokele
02740e84b6 build.sh: fix line endings in serverlist.txt before executing commands (#232)
Co-authored-by: Gyula Kelemen <kgydevelopement@gmail.com>
2025-06-10 20:47:53 +02:00
Joseph Gigantino
d71aa84e52 Update Unified branch to account for move from Docker Hub to GHCR (#227)
* Update build.sh to reflect move to GHCR

* Update build.ps1 to reflect move to GHCR

* Update README.md to reflect move to GHCR

* Update Dockerfile-bitwarden-patch to reflect move to GHCR
2025-03-29 17:15:16 +00:00
Michiel Hazelhof
770dcd33f6 Move Manually generating Certificate & Key section in README.md for unified (#220)
* Update Dockerfile

See #215 and #207

* Move Manually generating Certificate & Key section in README.md

See #216
2025-01-12 12:14:30 +01:00
Michiel Hazelhof
b6d2c9244c Update Dockerfile (#217)
See #215 and #207
2024-11-24 19:05:26 +01:00
Michiel Hazelhof
b47fe37279 Update license to version 15 (#211) (#212)
Co-authored-by: captainhook <16797541+captainhook@users.noreply.github.com>
2024-10-15 11:12:55 +01:00
Michiel Hazelhof
f75731633c Use new location (#201) 2024-06-30 01:30:58 +00:00
Michiel Hazelhof
0a45513872 Follow master updates and general improvements (#194)
* Use correct framework

* Upgrade packages

* Remove unused variable

* Migrate away from deprecated package

* Improve naming

* Fix typo

* Simplify constructors
2024-03-31 11:13:05 +01:00
Michiel Hazelhof
c8192610dc Properly fix Dockerfiles (#189) 2024-03-04 21:16:30 +00:00
Michiel Hazelhof
e4da85d46e Updated the unified branch (#180)
* Updated license version to 12, added SM options, increased max seats (short to int) (#172)

* - Updated license version to 12
- Added new SM license options
* Change seats, smseats, smserviceaccounts from short to int, like they are in the Bitwarden server code, to allow for the accurate maximum amount of seats

* Add extra ignore

* Code cleanup

* Ignore more VS cruft

* Bring up to date with upstream

(Update License to use Secrets Manager fully)

* Update to .NET 8.0
2024-02-23 14:44:27 +00:00
Michiel Hazelhof
38e6ebc5f9 Update licenseGen with latest version and options (#165) (#166)
Co-authored-by: Michiel Hazelhof <m.hazelhof@fyn.nl>
2023-04-23 12:41:27 +00:00
Michiel Hazelhof
d4abc9e5b7 Full Unified support including Linux and Windows (#155 / #154)
* Initial work

* Fix typo

* Fix typo

* Fix stupid issue

* Add comments and fix minor issues

* Add extra information

* Add Linux script for generating keys

* Add circleci

* Add comments

* Add extra option

* Add missing permissions and empty script for now

* Fix line endings

* Add missing mount point

* Simplify patch

* Fix scripts

* Reduce complexity

* Fix circleci

* Remove useless line

* Move to src folder and improve image creation
2023-01-16 21:13:43 +01:00
h44z
b819fe0c7d update to dotnet 6.0 (#148) (#150) 2022-09-01 14:43:34 -07:00