From 1a37e1ec72a9a61b6a6af6a8a0c86fdb9b2e7ee1 Mon Sep 17 00:00:00 2001 From: Lilian Schall Date: Tue, 20 Jan 2026 21:26:34 +0100 Subject: [PATCH 1/2] fix: slapd in /var/run was missing --- .github/workflows/build-image.yml | 42 ------------------------- .github/workflows/docker-push.yml | 52 +++++++++++++++++++++++++++++++ image/docker-entrypoint.sh | 3 +- 3 files changed, 54 insertions(+), 43 deletions(-) delete mode 100644 .github/workflows/build-image.yml create mode 100644 .github/workflows/docker-push.yml diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml deleted file mode 100644 index 643e6a0..0000000 --- a/.github/workflows/build-image.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: Docker Image CI - -on: - push: - branches: [ "main" ] - -jobs: - push_to_registry: - name: Push Docker image to Docker Hub - runs-on: ubuntu-latest - permissions: - packages: write - contents: read - attestations: write - id-token: write - steps: - - name: Check out the repo - uses: actions/checkout@v4 - - - name: Log in to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Extract metadata (tags, labels) for Docker - id: meta - uses: docker/metadata-action@v5 - with: - images: s3l4h/netauth - tags: | - type=raw,value=latest - - - name: Build and push Docker image - id: push - uses: docker/build-push-action@v5 - with: - context: image/ - file: image/Dockerfile - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml new file mode 100644 index 0000000..46cea6a --- /dev/null +++ b/.github/workflows/docker-push.yml @@ -0,0 +1,52 @@ +name: Build and Push Docker Image + +on: + push: + branches: + - main + workflow_dispatch: + +env: + REGISTRY: ghcr.io + IMAGE_NAME: ${{ github.repository }} + +jobs: + build-and-push: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Log in to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Extract metadata + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + tags: | + type=ref,event=branch + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=sha + type=raw,value=latest,enable={{is_default_branch}} + + - name: Build and push Docker image + uses: docker/build-push-action@v5 + with: + context: . + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} diff --git a/image/docker-entrypoint.sh b/image/docker-entrypoint.sh index dd7f983..1f132ae 100755 --- a/image/docker-entrypoint.sh +++ b/image/docker-entrypoint.sh @@ -26,7 +26,7 @@ create_global_var() export KRB_ADMIN_PASSWORD=${KRB_ADMIN_PASSWORD:-admin} export KRB_REALM=${KRB_REALM:-EXAMPLE.COM} - export DOMAIN_NAME=$(to_lower "$KRB_REALM") + export DOMAIN_NAME=${DOMAIN_NAME:-$(to_lower "$KRB_REALM")} export LDAP_DN=$(create_dn "$KRB_REALM") export LDAP_ORGANISATION=${LDAP_ORGANISATION:-EXAMPLE.COM} @@ -79,6 +79,7 @@ configuration() { replace_file "/container/config-slapd.sh"; debug_echo "Launching configuration"; /container/config-slapd.sh; + mkdir -p /var/run/slapd && chown openldap:openldap /var/run/slapd; /usr/sbin/slapd -h "ldapi:// ldap://" -u openldap -g openldap; sleep 10; /container/config-openldap.sh From 55d5bfb25965cdf3b930c048d2ae117e37e30b7f Mon Sep 17 00:00:00 2001 From: Lilian Schall Date: Tue, 20 Jan 2026 21:28:47 +0100 Subject: [PATCH 2/2] fix: added correct schema for usrPrincipalName --- image/schemas/add/06-ldap_groups.ldif | 7 ++++--- image/schemas/add/09-add_microsoft_schema.ldif | 9 +++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 image/schemas/add/09-add_microsoft_schema.ldif diff --git a/image/schemas/add/06-ldap_groups.ldif b/image/schemas/add/06-ldap_groups.ldif index ae0dd6b..b7d7634 100644 --- a/image/schemas/add/06-ldap_groups.ldif +++ b/image/schemas/add/06-ldap_groups.ldif @@ -6,7 +6,8 @@ dn: ou=Groups,{{ LDAP_DN }} objectClass: organizationalUnit ou: Groups -dn: cn=storers,ou=Groups,{{ LDAP_DN }} +dn: cn=Employees,ou=Groups,{{ LDAP_DN }} +objectClass: top objectClass: posixGroup -cn: storers -gidNumber: 10001 +cn: Employees +gidNumber: 100 diff --git a/image/schemas/add/09-add_microsoft_schema.ldif b/image/schemas/add/09-add_microsoft_schema.ldif new file mode 100644 index 0000000..ac728ba --- /dev/null +++ b/image/schemas/add/09-add_microsoft_schema.ldif @@ -0,0 +1,9 @@ +dn: cn=microsoft,cn=schema,cn=config +objectClass: olcSchemaConfig +cn: microsoft +olcAttributeTypes: ( 1.2.840.113556.1.4.656 + NAME 'userPrincipalName' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX '1.3.6.1.4.1.1466.115.121.1.15' + SINGLE-VALUE )