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

Add server 2022 & office LTSC 2021 #146

Open
wants to merge 200 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
200 commits
Select commit Hold shift + click to select a range
e780854
Unified volume mount paths
simonmicro Mar 25, 2021
0f0468f
Merge pull request #1 from simonmicro/patch-1
simonmicro Sep 12, 2021
b170ce6
Added initial github config
simonmicro Sep 12, 2021
cfdd668
Fixed python (broken by upstream)
simonmicro Sep 12, 2021
acf8b31
Fixed wrong push target
simonmicro Sep 12, 2021
57ab28d
Added manual trigger
simonmicro Sep 12, 2021
b120555
Added GHCR support
simonmicro Sep 12, 2021
5109446
Corrected wrong tagging
simonmicro Sep 12, 2021
d1db33f
Switch to runner based authentication
simonmicro Sep 12, 2021
0ac968c
Added 2022 GLVKs
simonmicro Sep 13, 2021
873ee72
Corrected clone location for new repo
simonmicro Sep 13, 2021
da20220
Removed fresh code cloning from building (use the local cahced versio…
simonmicro Sep 13, 2021
e151f97
Added enhancement for Windows Server 2022
simonmicro Sep 13, 2021
c3ae9a9
Added Windows Server 2022
simonmicro Sep 13, 2021
b1e66b6
Updated shields to point to new repository
simonmicro Sep 13, 2021
c760b28
Added history of this fork
simonmicro Sep 13, 2021
ea711f8
Update README.md
MichelBaie Sep 19, 2021
f7062f7
Add Helm chart for py-kms
Matthew-Beckett Oct 7, 2021
83a1638
Add helm-docs generated README.md
Matthew-Beckett Oct 7, 2021
6f5b743
Fix service.yaml containing invalid targetPort
Matthew-Beckett Oct 7, 2021
4a7a8cf
Enable writing to logfile in container until stdout is fixed
Matthew-Beckett Oct 7, 2021
f93ea7f
Update Keys.md
CreeperKong Oct 9, 2021
54500ec
Merge pull request #7 from CreeperKong/patch-1
simonmicro Oct 11, 2021
66c51d7
Merge pull request #4 from MichelBaie/patch-1
simonmicro Oct 11, 2021
5de292e
Remove validation of LOGFILE extension
Matthew-Beckett Oct 7, 2021
4a7376f
Fix pytz and time localization
simonmicro Oct 13, 2021
3fe2b45
Extended error message
simonmicro Oct 13, 2021
3806c03
Fix broken check_dir() call from 5de292e12a9090a716001ddf2e0f9bad5941…
simonmicro Oct 13, 2021
cb8a95e
Fir for undefnied time zones
simonmicro Oct 14, 2021
0630b22
Switch to whole new entrypoint system
simonmicro Oct 14, 2021
fba768b
Extended docs for SQLITE stuff
simonmicro Oct 14, 2021
b2b9cb1
Fix entrypoint
thespad Oct 14, 2021
8c1d23f
Fix entrypoint
thespad Oct 14, 2021
0ac6d7a
Merge pull request #12 from TheSpad/fix-entrypoint
simonmicro Oct 14, 2021
74850b8
Corrected path back to current work directory and formatted log message
simonmicro Oct 14, 2021
d056610
Integrated Office 2021 GLVK keys & database
simonmicro Oct 17, 2021
b00e743
Fixed broken SQLite entrypoint (https://github.com/Py-KMS-Organizatio…
simonmicro Oct 17, 2021
4ee742d
Fix for missing environment variables
simonmicro Oct 21, 2021
eb42224
Block SQLITE in case sqlite-web files are missing
simonmicro Oct 21, 2021
5df5487
Switch from pulls-limited Docker Hub to Github Container Registry
simonmicro Oct 21, 2021
677916a
Update entrypoint.py
lepoarro Oct 22, 2021
b51a17a
Merge branch 'master' into feature/helm-chart
Matthew-Beckett Oct 22, 2021
d25d732
Add installation instructions to helm chart Readme
Matthew-Beckett Oct 22, 2021
73a80ba
Bump urllib3 from 1.25.9 to 1.26.5 in /docs
dependabot[bot] Oct 22, 2021
6dcd059
Bump babel from 2.8.0 to 2.9.1 in /docs
dependabot[bot] Oct 22, 2021
a981e4a
Bump pygments from 2.6.1 to 2.7.4 in /docs
dependabot[bot] Oct 22, 2021
94bcba3
Bump jinja2 from 2.11.2 to 2.11.3 in /docs
dependabot[bot] Oct 22, 2021
ad73268
Merge pull request #18 from lepoarro/patch-1
simonmicro Oct 22, 2021
daaf750
Merge pull request #5 from Matthew-Beckett/feature/helm-chart
simonmicro Oct 22, 2021
7e52be8
Merge pull request #22 from Py-KMS-Organization/dependabot/pip/docs/j…
simonmicro Oct 22, 2021
2533df4
Merge pull request #20 from Py-KMS-Organization/dependabot/pip/docs/b…
simonmicro Oct 22, 2021
12588bb
Merge pull request #19 from Py-KMS-Organization/dependabot/pip/docs/u…
simonmicro Oct 22, 2021
a709f28
Merge pull request #21 from Py-KMS-Organization/dependabot/pip/docs/p…
simonmicro Oct 22, 2021
bd2871c
Minimal requirements
simonmicro Oct 22, 2021
fa74f8a
Readded missing module
simonmicro Oct 22, 2021
0c0e345
Added Office 2021
simonmicro Oct 23, 2021
06d1317
Merge pull request #24 from Py-KMS-Organization/preview/office21
simonmicro Oct 23, 2021
e620e92
For #23 #25
simonmicro Oct 24, 2021
f9e7df6
lint dockerfile, set TZ and UID/GID, have client log.
edgd1er Oct 14, 2021
d2394cd
start as root, change uid/gid, drop priv, run server/client
edgd1er Oct 22, 2021
6d71244
use unbuffered output globally.
edgd1er Oct 23, 2021
5f7ef13
add proper logger to entrypoint and start
edgd1er Oct 25, 2021
a564822
add healthcheck with netcap checking port
edgd1er Oct 26, 2021
2979e78
add missing setting to timzeone.
edgd1er Oct 29, 2021
51e2210
var added as requested and renamed as per PEP-008
edgd1er Oct 30, 2021
70975bb
Merge pull request #13 from edgd1er/master
simonmicro Oct 31, 2021
fa17996
fix dockerfile for minimal kms
edgd1er Oct 31, 2021
deddf0c
Merge pull request #28 from edgd1er/master
simonmicro Oct 31, 2021
ba25df0
subprocess should be run when this if statement is true
yangzhaofeng Nov 1, 2021
7f4fe7d
code style
yangzhaofeng Nov 1, 2021
50f4778
Merge pull request #30 from yangzhaofeng/patch-1
simonmicro Nov 1, 2021
008143b
Fix healthchecks, make Dockerfiles consistent
thespad Nov 9, 2021
e67f14c
Fix HC interval
thespad Nov 9, 2021
edc028c
Fix HC interval typo
thespad Nov 9, 2021
7f08d75
Merge pull request #33 from TheSpad/fix-healthchecks
simonmicro Nov 9, 2021
2312a2d
Fixed not dropping privileges to py-kms user by default
gh0st-app1e Nov 30, 2021
7073b88
Fix loglevel MININFO for docker
xWTF Dec 3, 2021
88bd053
Merge pull request #40 from xWTF/master
simonmicro Dec 3, 2021
c89f74a
Merge pull request #39 from gh0st-app1e/master
simonmicro Dec 5, 2021
59e9d47
Removed unused dependency
simonmicro Dec 9, 2021
1e6a55d
Fix for #36
simonmicro Dec 9, 2021
28faacd
Added CTRL+C check
simonmicro Dec 9, 2021
11e8b4d
Corrected SO_REUSEPORT behavior on unsupported platforms
simonmicro Dec 9, 2021
7350ba1
Silenced deprecated warning in Python 3.10
simonmicro Dec 9, 2021
01fa142
Updated Python version info
simonmicro Dec 9, 2021
c186432
Added Windows 11 to supported list
simonmicro Dec 9, 2021
98008d6
Merge pull request #42 from Py-KMS-Organization/next
simonmicro Dec 9, 2021
9258a29
Merge pull request #43 from Py-KMS-Organization/feature/win11
simonmicro Dec 9, 2021
7935b09
Added Windows 10 21H2
arturolegovich Dec 10, 2021
da6d510
Merge pull request #44 from arturolegovich/patch-1
simonmicro Dec 10, 2021
9c44b6e
Added proper Windows 11 key names for #46
simonmicro Dec 14, 2021
464a639
Merge pull request #47 from Py-KMS-Organization/win11keys
simonmicro Dec 15, 2021
b0b3a62
Clarification of edition Enterprise multi-session
sashaqwert Dec 22, 2021
8a7da28
Improved readability
sashaqwert Dec 22, 2021
476f7fa
Merge pull request #50 from sashaqwert/patch-1
simonmicro Dec 22, 2021
bc3c504
Corrected permissions on database file (and parent folder for #48)
simonmicro Dec 23, 2021
05fdd33
Added permission unlocker for log files
simonmicro Dec 23, 2021
81e616d
Proper failure if entry in database is not found
simonmicro Dec 23, 2021
cd07807
Added more debug logging & FINALLY corrected permission fixer
simonmicro Dec 23, 2021
882eeb8
Removed link to special file, as it does not work anyways
simonmicro Dec 23, 2021
59d9c2a
Merge pull request #52 from Py-KMS-Organization/fixes/bugs
simonmicro Dec 23, 2021
feb6d79
Fixes #54
simonmicro Jan 6, 2022
297d6bb
Merge pull request #56 from Py-KMS-Organization/fixes/bugs
simonmicro Jan 6, 2022
65e9808
Update Dockerfile
Jacobite89 Feb 11, 2022
fab7b50
Update Dockerfile
Jacobite89 Feb 11, 2022
837236c
Merge pull request #58 from Jacobite89/master
simonmicro Feb 11, 2022
238af40
Allow multiple IPs in dovecot IP env variable
SoLoR1 Apr 3, 2022
7979f40
Fix healthcheck to netcat to actual IP
SoLoR1 Apr 4, 2022
943a63d
Fix healthcheck to netcat to actual IP
SoLoR1 Apr 4, 2022
c6ca763
Merge pull request #61 from SoLoR1/patch-1
simonmicro Apr 5, 2022
d892d81
Merge pull request #62 from SoLoR1/patch-2
simonmicro Apr 5, 2022
e7135b5
Correct "lcid" info & reorder for clarity
Apr 9, 2022
a43f16a
Merge pull request #64 from martinsstuff/master
simonmicro Apr 11, 2022
805c234
client: add -D to discover KMS server #51
edgd1er Apr 13, 2022
ddb99dd
add dnspython to docker image, add doc. #51
edgd1er Apr 13, 2022
c74a64c
client: handle dns exceptions #51
edgd1er Apr 14, 2022
248c144
client: request #51 add automatic discovery.
edgd1er Apr 15, 2022
7bea3a2
Merge pull request #66 from edgd1er/dev
simonmicro Apr 22, 2022
5d13d09
Removed useless CMD statement (entrypoint does not even respect that)
simonmicro May 12, 2022
c216e50
Implemented graceful shutdown
simonmicro May 12, 2022
90b4af2
move requirements from Dockerfile to txt file. #67
edgd1er Apr 22, 2022
17bc78f
add versions, removed sudo, powerusers group,
edgd1er May 2, 2022
6e5ad3c
remove unused import
edgd1er May 13, 2022
1435c86
Merge pull request #68 from edgd1er/req
simonmicro May 29, 2022
ffc1bf6
Do not run py-kms on the same machine to activate
yangzhaofeng Jul 12, 2022
364c15c
Merge pull request #72 from yangzhaofeng/patch-1
simonmicro Jul 12, 2022
9d4d8b6
Added workaround from #76
simonmicro Nov 6, 2022
01ad610
Added useage note and removed old badge
simonmicro Nov 25, 2022
537f7a7
Added missing package
simonmicro Nov 25, 2022
e8c2fb7
Updated packages
simonmicro Nov 25, 2022
d8c1d75
Migrated to use "::" by default for #71
simonmicro Dec 7, 2022
57f2159
Default dual-stack socket
simonmicro Dec 7, 2022
e5a7f77
Added warning about removal of Etrigan support
simonmicro Dec 7, 2022
bc25dd5
Removed two old badges from docs
simonmicro Dec 7, 2022
964dde6
Switched default log level to warning
simonmicro Dec 7, 2022
ee5be9a
Merge pull request #78 from Py-KMS-Organization/deprecation/etrigan/w…
simonmicro Dec 7, 2022
f88ada3
Added workflow for different stages
simonmicro Feb 21, 2023
fe7784d
Merge pull request #79 from Py-KMS-Organization/feature/ipv6_default
simonmicro Feb 21, 2023
77e545d
Removed Etrigan support
simonmicro Dec 9, 2022
f1fa5b7
Removed Etrigan GUI support
simonmicro Dec 9, 2022
4bd6095
Removed old gui code references and variables
simonmicro Dec 9, 2022
fdf1445
Removed docs dependencies from requirements.txt
simonmicro Dec 9, 2022
5a8a21a
Removed sqliteweb support
simonmicro Dec 9, 2022
f15ed48
Switched sqlite parameter to point to file instead of dir
simonmicro Dec 9, 2022
88f96a2
Removed dummy client code
simonmicro Dec 9, 2022
767751c
Removed old graphics
simonmicro Dec 9, 2022
03c3e1c
First web UI draft
simonmicro Dec 11, 2022
28e07ac
Added sub-page for license information
simonmicro Dec 11, 2022
0cb3ee5
Added products sub-page
simonmicro Dec 11, 2022
ca7ba46
Fixed missing primary key
simonmicro Dec 11, 2022
5674e26
Added new webui support into docker
simonmicro Dec 11, 2022
37d09c6
Updated install instructions
simonmicro Dec 11, 2022
460a714
Fixed inaccessible products without clients
simonmicro Dec 11, 2022
16eb5a0
Updated some docs references to the web interface port
simonmicro Dec 11, 2022
ddf1ad8
Added note regarding the used command
simonmicro Dec 11, 2022
d3fabf3
Added web-ui screenshot
simonmicro Dec 11, 2022
d795f52
Fixed startup on minimal tag
simonmicro Dec 11, 2022
8185207
Added version metadata into container
simonmicro Dec 11, 2022
bf323f7
Added new build-args containing the version info
simonmicro Dec 11, 2022
d0d2b60
Updated changelog to today
simonmicro Dec 11, 2022
f098169
Merge pull request #82 from Py-KMS-Organization/deprecation/etrigan/r…
simonmicro Feb 21, 2023
dd1d6b7
Added missing build args to all versions
simonmicro Feb 21, 2023
81e9973
Removed all references to Docker Hub after their removal of "Free Tea…
simonmicro Mar 14, 2023
98e0900
Added /readyz and /livez endpoints
simonmicro Mar 15, 2023
32b6623
Fixed space at end of string
simonmicro Mar 15, 2023
dfbeee6
Added new endpoints
simonmicro Mar 15, 2023
314cefb
Merge pull request #86 from Py-KMS-Organization/next
simonmicro Apr 22, 2023
dada9c5
Fixed syntax error
simonmicro May 6, 2023
858fb14
Fix for #84
simonmicro May 6, 2023
92ec80b
Make hardware-id random in scripts #65
simonmicro May 6, 2023
474c5fe
Fixed healthcheck for classic (non Kubernetes) Docker (broken with de…
simonmicro May 6, 2023
6da4791
Silenced healthcheck caused warning
simonmicro May 6, 2023
1b4f0a9
Flask security update
simonmicro May 6, 2023
182ccbe
Newline
simonmicro May 6, 2023
a3eac08
Merge pull request #90 from Py-KMS-Organization/next
simonmicro May 7, 2023
b705a36
add key to docs
plazotronik Jun 9, 2023
441e50a
Merge pull request #93 from plazotronik/add_key_to_docs
simonmicro Jun 9, 2023
9bdc0e4
Apply patch from hyperboreanwolfgirl for Windows Server 2022
Matthew-Beckett Jun 26, 2023
7ef21ab
:memo: Update README.md
ATENSI Jul 12, 2023
69cbe51
:fire: Update Dockerfile: remove commented code
ATENSI Jul 12, 2023
599574b
Merge pull request #98 from ATENSI/patch-2
simonmicro Jul 30, 2023
4acd86d
Added rtd config
simonmicro Jan 18, 2024
8c2350d
Merge branch 'next'
simonmicro Jan 18, 2024
0d59182
Docs security update
simonmicro Jan 18, 2024
a722f8b
All formats ;)
simonmicro Jan 18, 2024
4482b62
Fixed theme
simonmicro Jan 18, 2024
291bb62
Migrate to non-deprecated myst-parser
simonmicro Jan 18, 2024
fa6e536
Merge branch 'master' into next
simonmicro Jan 18, 2024
35fbc76
Merge pull request #103 from Py-KMS-Organization/next
simonmicro Jan 18, 2024
6a096c1
Changed to relative link
simonmicro Mar 23, 2024
17bb7a8
Merge pull request #97 from ATENSI/patch-1
simonmicro Mar 23, 2024
e8ad973
Minor note how to run the web-interface
simonmicro May 19, 2024
da7feff
Fixed incorrect Boolean, now aligns with the description of “deactiva…
simonmicro May 19, 2024
11b5c69
Security update
simonmicro May 19, 2024
9454447
Merge pull request #96 from Py-KMS-Organization/feature/windows-serve…
simonmicro May 19, 2024
e5f93ff
Merge pull request #110 from Py-KMS-Organization/next
simonmicro May 26, 2024
a9b17ad
Allow explixit dualstack-control via flag
simonmicro May 28, 2024
b72e628
Exposed dualstack argument on Docker
simonmicro May 28, 2024
646f476
Merge pull request #114 from Py-KMS-Organization/next
simonmicro May 28, 2024
03992a8
Add support for Windows Server 2025 & Office 2024 LTSC
SkylarKaede Jan 6, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
log/
.idea
.github
*.db
*.yml
*.md
*.sh
Makefile
51 changes: 51 additions & 0 deletions .github/workflows/bake_to_latest.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: Build release-tags

on:
workflow_dispatch:
push:
branches:
- master

jobs:
bake-latest:
runs-on: ubuntu-latest
permissions:
packages: write
contents: read
steps:
- name: Checkout
uses: actions/[email protected]
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
with:
platforms: all
- name: Set up Docker Buildx
uses: docker/[email protected]
- name: Login to GitHub Container Registry
uses: docker/[email protected]
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build
uses: docker/build-push-action@v2
with:
context: .
file: ./docker/docker-py3-kms/Dockerfile
platforms: linux/amd64,linux/386,linux/arm64/v8,linux/arm/v7,linux/arm/v6
push: true
tags: ghcr.io/py-kms-organization/py-kms:python3
build-args: |
BUILD_COMMIT=${{ github.sha }}
BUILD_BRANCH=${{ github.ref_name }}
- name: Build
uses: docker/build-push-action@v2
with:
context: .
file: ./docker/docker-py3-kms-minimal/Dockerfile
platforms: linux/amd64,linux/386,linux/arm64/v8,linux/arm/v7,linux/arm/v6
push: true
tags: ghcr.io/py-kms-organization/py-kms:latest,ghcr.io/py-kms-organization/py-kms:minimal
build-args: |
BUILD_COMMIT=${{ github.sha }}
BUILD_BRANCH=${{ github.ref_name }}
51 changes: 51 additions & 0 deletions .github/workflows/bake_to_next.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: Build next-tags

on:
workflow_dispatch:
push:
branches:
- next

jobs:
bake-next:
runs-on: ubuntu-latest
permissions:
packages: write
contents: read
steps:
- name: Checkout
uses: actions/[email protected]
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
with:
platforms: all
- name: Set up Docker Buildx
uses: docker/[email protected]
- name: Login to GitHub Container Registry
uses: docker/[email protected]
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build
uses: docker/build-push-action@v2
with:
context: .
file: ./docker/docker-py3-kms/Dockerfile
platforms: linux/amd64,linux/386,linux/arm64/v8,linux/arm/v7,linux/arm/v6
push: true
tags: ghcr.io/py-kms-organization/py-kms:python3-next
build-args: |
BUILD_COMMIT=${{ github.sha }}
BUILD_BRANCH=${{ github.ref_name }}
- name: Build
uses: docker/build-push-action@v2
with:
context: .
file: ./docker/docker-py3-kms-minimal/Dockerfile
platforms: linux/amd64,linux/386,linux/arm64/v8,linux/arm/v7,linux/arm/v6
push: true
tags: ghcr.io/py-kms-organization/py-kms:latest-next,ghcr.io/py-kms-organization/py-kms:minimal-next
build-args: |
BUILD_COMMIT=${{ github.sha }}
BUILD_BRANCH=${{ github.ref_name }}
38 changes: 38 additions & 0 deletions .github/workflows/bake_to_test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Test-Build Docker Image

on:
workflow_dispatch:
push:

jobs:
bake-test:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/[email protected]
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
with:
platforms: all
- name: Set up Docker Buildx
uses: docker/[email protected]
- name: Build
uses: docker/build-push-action@v2
with:
context: .
file: ./docker/docker-py3-kms/Dockerfile
platforms: linux/amd64,linux/386,linux/arm64/v8,linux/arm/v7,linux/arm/v6
push: false
build-args: |
BUILD_COMMIT=${{ github.sha }}
BUILD_BRANCH=${{ github.ref_name }}
- name: Build
uses: docker/build-push-action@v2
with:
context: .
file: ./docker/docker-py3-kms-minimal/Dockerfile
platforms: linux/amd64,linux/386,linux/arm64/v8,linux/arm/v7,linux/arm/v6
push: false
build-args: |
BUILD_COMMIT=${{ github.sha }}
BUILD_BRANCH=${{ github.ref_name }}
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
pykms_logserver.log*
pykms_logclient.log*
pykms_database.db*
etrigan.log*

# Byte-compiled / optimized / DLL files
__pycache__/
Expand Down Expand Up @@ -128,3 +127,8 @@ dmypy.json
# Pyre type checker
.pyre/

# Helm
charts/*/*.tgz
/.idea/
docker-compose-*.yml
*.sh
12 changes: 12 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
version: 2

build:
os: "ubuntu-22.04"
tools:
python: "3.10"

python:
install:
- requirements: docs/requirements.txt

formats: all
Loading