Commit Graph

55 Commits

Author SHA1 Message Date
clanto007 af2d744061
fix '3.1.0' was not found (#116)
* Update build.sh

* Update Dockerfile

* Update bitBetter.csproj

* Update Dockerfile

* Update Dockerfile

* Update licenseGen.csproj

* Apply suggestions from code review

Co-authored-by: h44z <christoph.h@sprinternet.at>

* Update src/licenseGen/Dockerfile

Co-authored-by: h44z <christoph.h@sprinternet.at>

* Update src/licenseGen/Dockerfile

Co-authored-by: h44z <christoph.h@sprinternet.at>
2021-08-31 10:18:29 +02:00
captainhook a17681e82b
fix integer type (#110)
fix integer type for GenerateOrgLicense's "Seats" value
2021-08-09 18:10:49 +02:00
captainhook 21bffcf262
Update update-bitwarden.sh (#95)
Prune Docker images to reclaim space
2021-03-17 10:38:54 +01:00
p0thi 59ee2e3c3a
Make update-bitwarden.sh able to run non-interactive (#90)
* make update-bitwarden.sh able to run non-interactive

* changed script to be runnable by bash 3.x & README entry edited
2021-01-27 14:51:13 +01:00
kerenon 7ddf01fdf6
MaxStorageGb customization (#88)
* MaxStorageGb customization

* Defaulting to short.MaxValue if user entry is blank

* Update text prompt
2020-11-26 13:04:18 +00:00
captainhook 46934b0ddd
Update README.md (#84)
Correct licenseGen build step

Co-authored-by: h44z <christoph.h@sprinternet.at>
2020-10-06 14:52:55 +01:00
Joe S a5516220fd
Fix wrong directory mistake, fix grammer (#83)
Fixed the license generator section
2020-10-06 15:49:47 +02:00
h44z 91d0155725
Fix build.sh and update script (#75) (#77)
* possible fix for #75

* Remove outdated bitbetter images as suggested by Ayitaka

* Fix exit status if no old images have been removed
2020-09-19 23:36:15 +01:00
h44z f2b3b1babf
Updates 1.34.0 (#69)
* Use latest release of bitwarden as base image (#67, #66)

* Add a script which simplifies Bitwarden updates

* fix typo

* Add UseApi

* Updated version, created update section

* Workaround for docker-compose --ignore-pull-failures bugs (4377 and 7127)

* use version from docker script

* check if bitbetter images are outdated

Co-authored-by: Lework <kuailemy123@163.com>
Co-authored-by: Jake Swenson <jakeswenson@users.noreply.github.com>
Co-authored-by: Jeff Alyanak <jeff@alyanak.ca>
2020-09-10 15:39:20 -04:00
captainhook 7d8f0b1082
Make Sso available in org license (#73)
* Exclude cert.cert from git

* Use latest release of bitwarden as base image (#67, #66)

* Add a script which simplifies Bitwarden updates

* fix typo

* Add UseApi

* Updated version, created update section

* Workaround for docker-compose --ignore-pull-failures bugs (4377 and 7127)

* use version from docker script

* check if bitbetter images are outdated

* Make Sso available in org license

Add `UseSso` var and enable

* Update README.md

Co-authored-by: Christoph Haas <christoph.h@sprinternet.at>
Co-authored-by: Lework <kuailemy123@163.com>
Co-authored-by: Captainhook <ec14018@qmul.ac.uk>
2020-09-10 15:36:44 -04:00
h44z 6527ac8362
Exclude cert.cert from git (#68) 2020-09-10 11:59:12 -07:00
accolon faf7833f44
Make policies available in generated org licenses. (#56)
* Make policies available in generated org licenses.

* Change license version to current value used in BitWarden. Add info about compatibility in README file.
2020-03-17 12:19:18 +00:00
Michiel Hazelhof 006fa1fecf
Update .net core and newtonsoft.json
Co-authored-by: Michiel Hazelhof <m.hazelhof@fyn.nl>

Due to compatibility issues laid out in issue #53:

Update from .net core 2.0 to 3.1 and newtonsoft.json 12.0.1 to 12.0.3.
2020-03-14 07:00:25 -04:00
Jan Schöppach 9c62a6f2ca
Update README.md (#50)
* Update README.md

Added note that testing has been done up to Bitwarden 1.32.0.

Replaced editing of `docker-compose.yml` with the update-resistant usage
of `docker-compose.override.yml`
2020-02-27 13:05:29 -05:00
Jeff Alyanak a2189a874e
Updated Readme (#44)
* Updated Readme

Better description of dependencies, updated readme.

* Fixed default key directory

Script was not looking in the right place for the auto-generated key directory. This patch fixes issue #35.

* Cleans up Key Directory Patch

Key directory path fix was echoing the directory when run.
2020-01-18 14:33:03 -05:00
Jeff Alyanak d98d4cad6a
Fixed default key directory (#46)
* Fixed default key directory

Script was not looking in the right place for the auto-generated key directory. This patch fixes issue #35.

* Cleans up Key Directory Patch

Key directory path fix was echoing the directory when run.
2019-12-27 19:25:41 -05:00
Vinrobot 3e44d7347b Improve build and scripts (#30)
* Use absolute path rather than relative path in scripts

* Remove src/bitBetter/.keys/cert.cert

* Build licenseGen in Docker
This way we don't have to install dotnet sdk on the host

* Build bitBetter in Docker
This way we don't have to install dotnet sdk on the host

* Change DIR in run.sh to point to the project root

* Replace echo in Dockerfiles by set -x and set -e

* Use same Dockerfile for api and identity images

* Update README.md

* Update CircleCI config
The Docker Executor can't mount volume.
https://support.circleci.com/hc/en-us/articles/360007324514
https://circleci.com/docs/2.0/executor-types/#using-machine

* Make scripts work with sh

* Remove the container used to build bitBetter
2019-07-07 12:18:27 -04:00
Jan Schöppach 5d01d3c661 Fix recreation of keys on every execution (#27)
* Fix recreation of keys on every execution
2019-06-19 09:34:33 -04:00
Jeff Alyanak 6c8789cd67
License Generator Interactive Mode (#23)
* Added a Key Generating script

To make the keygen process a bit easier I've added a `generate-keys.sh` script that can be found in the `.keys` directory. It will generate the key & cert and bundle them into the required pkcs#12 file.

I've updated the readme to include instructions on the script.

* Generate bitbetter/identiry container with modified Core.dll

Added the generation of a second modified container, bitbetter/identity, which contains the modified dll. Fixes #12.

This works on my testing environment but has not gone through extensive testing. I'd recommend a review and cleanup of this commit before it is merged into the develop or master branches.

* Updated Docs

I've taken the steps written out by @online-stuff and consolidated/organized them into the README. This closes #13.

In a future update it might be worth adding a docs/ directory and breaking the readme into several docs that link to one another.

* Updated build.sh

Build now checks for and creates missing .keys directories.

* Added subj to allow for non-interactive use.

* Generate keys on build.

* Circle-ci needs to gen keys to test build

* Generate keys if they don't exist.

Don't overwrite if keys already exist.

* Generate keys online in the .keys directory

* Updated README.md

* Added initial interactive options

* Functional implementation of licensegen interactive mode.

* Bumped Newtonson.Json version

Never versions of the dotnet-sdk have issues with older Newtonsoft versions. 12.0.1 seems to satisfy the widest variety of sdk versions.

* Removing old readme

* Removed Duplicate Section

* Fixed typo

This fixes and closes issue #24.
2019-06-05 14:19:39 -04:00
Jeff Alyanak 15371c362c
Bitbetter identity Core.dll (#14)
* Added a Key Generating script

To make the keygen process a bit easier I've added a `generate-keys.sh` script that can be found in the `.keys` directory. It will generate the key & cert and bundle them into the required pkcs#12 file automatically when running the build script if none already exist.

* Generate bitbetter/identiry container with modified Core.dll

Added the generation of a second modified container, bitbetter/identity, which contains the modified dll. Fixes #12.

This works on my testing environment but has not gone through extensive testing. I'd recommend a review and cleanup of this commit before it is merged into the develop or master branches.
2019-05-25 18:12:10 -04:00
Jeff Alyanak 5f85d83e45 Updated Docs (#15)
* Updated Docs

I've taken the steps written out by @online-stuff and consolidated/organized them into the README. This closes #13.

In a future update it might be worth adding a docs/ directory and breaking the readme into several docs that link to one another.

* Fixed Broken section Links
2019-05-20 22:21:10 -07:00
Jake Swenson 664b75ac81
Merge pull request #9 from online-stuff/master
Creating a Pull Request
2019-05-10 09:34:19 -07:00
online-stuff 9f1422ac68
Removed /jobs commands, not needed anymore. 2018-11-30 14:39:08 -07:00
online-stuff b87c8c5e84
Update README.md 2018-11-21 23:36:46 -07:00
online-stuff 6d3d1ee3f1
Update README.md 2018-11-21 22:03:21 -07:00
online-stuff 27869735fb
Update README.md 2018-11-21 21:39:13 -07:00
online-stuff 1507f336c1
Update README.md 2018-11-21 21:37:36 -07:00
online-stuff 65dccd1768
Create ReadMeInstall 2018-11-21 21:30:18 -07:00
online-stuff 12a92634fb
Rename touchfolder to Empty.txt 2018-11-21 21:04:18 -07:00
online-stuff 36e8c8e513
Create touchfolder 2018-11-21 21:03:35 -07:00
online-stuff f665630abd
Delete cert.cert
Generate your own certificate
2018-11-21 20:59:30 -07:00
online-stuff a38ef370cb
Update Program.cs 2018-11-21 20:42:23 -07:00
online-stuff 1da8b95cbd
Update Program.cs 2018-11-21 20:17:39 -07:00
online-stuff c6da1246dd
Update Program.cs 2018-11-21 19:49:40 -07:00
online-stuff 6277b96b6a
Update Dockerfile
Fix cp error
2018-11-21 19:27:25 -07:00
Jake Swenson 1f37163c8f fix jobs 2017-10-30 08:20:27 -07:00
Jake Swenson 6580c442b9 user id fix 2017-10-29 17:58:34 -07:00
Jake Swenson 3cabfe0bf7 update readme 2017-10-29 12:51:53 -07:00
Jake Swenson 92555591f5 fixed 2017-10-29 12:44:54 -07:00
Jake Swenson b1a8ec5031 typo 2017-10-29 12:19:20 -07:00
Jake Swenson cae6e6f051 type 2017-10-29 12:18:22 -07:00
Jake Swenson 1b2dd6bb10 type; fix build 2017-10-29 12:16:28 -07:00
Jake Swenson f7ec8b477d updates 2017-10-29 12:13:38 -07:00
Jake Swenson 5c58b0d8fd adding license gen 2017-10-29 09:57:49 -07:00
Jake Swenson 72b24aeecd build status 2017-10-22 10:48:35 -07:00
Jake Swenson 8d930e58e5 no squash 2017-10-22 10:41:02 -07:00
Jake Swenson 773b47fd49 install docker 2017-10-22 10:38:44 -07:00
Jake Swenson 6c2561ee23 fix yaml name 2017-10-22 10:31:38 -07:00
Jake Swenson 44d5f18c2e adding build 2017-10-22 10:29:38 -07:00
Jake Swenson 13f33a900a build script 2017-10-22 10:09:25 -07:00