Skip to content

Commit c413a38

Browse files
committed
2.6-1.5-8.0.0pre
1 parent dfec170 commit c413a38

File tree

24 files changed

+833
-1071
lines changed

24 files changed

+833
-1071
lines changed

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
examples/

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ assignees: ''
2929
### Environment
3030
<!--Your Configuration (please complete the following information): -->
3131

32-
- Image version / tag:
32+
- Image version / tag:
3333
- Host OS:
3434

3535
<details>
36-
<summary>Any logs | docker-compose.yml</summary>
36+
<summary>Any logs | compose.yml</summary>
3737
</details>
3838

3939
<!-- Include anything additional -->
40-
40+
4141
### Possible fixes
4242
<!-- If you can, provide details to the root cause that might be responsible for the problem. -->

.github/dependabot.yml

Lines changed: 0 additions & 7 deletions
This file was deleted.

.github/workflows/main.yml

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,37 @@
1-
name: "build_image"
2-
31
on:
42
push:
53
paths:
6-
- "**"
7-
- "!README.md"
8-
4+
- '**'
5+
- '!CHANGELOG.md'
6+
- '!/examples/*'
7+
- '!LICENSE'
8+
- '!README.md'
9+
- '!/zabbix_templates/*'
910
jobs:
11+
prepare:
12+
uses: nfrastack/gha/.github/workflows/artifacts-encrypt.yml@main
13+
secrets: inherit
1014
build:
11-
uses: tiredofit/github_actions/.github/workflows/default_amd64_armv7_arm64.yml@main
12-
#uses: tiredofit/github_actions/.github/workflows/default_amd64.yml@main
13-
#uses: tiredofit/github_actions/.github/workflows/default_amd64_armv7_arm64.yml@main
14-
#uses: tiredofit/github_actions/.github/workflows/default_amd64_arm64.yml@main
15+
needs: prepare
16+
strategy:
17+
matrix:
18+
include:
19+
- { distro: "2.6", latest: "true", arch: "linux/amd64,linux/arm64" }
20+
uses: nfrastack/gha/.github/workflows/container-build_generic.yml@main
21+
with:
22+
base_image: "ghcr.io/nfrastack/container-openldap"
23+
distro: ${{ matrix.distro }}
24+
distro_variant: ${{ matrix.distro_variant }}
25+
image_variant: ${{ matrix.image_variant || '' }}
26+
tag: ${{ matrix.tag || '' }}
27+
latest: ${{ matrix.latest }}
28+
distro_latest: ${{ matrix.distro_latest }}
29+
platforms: ${{ matrix.arch }}
30+
push_dockerhub: ${{ matrix.push_dockerhub || true }}
31+
push_ghcr: ${{ matrix.push_ghcr || true }}
1532
secrets: inherit
33+
cleanup:
34+
needs: [ build ]
35+
uses: nfrastack/gha/.github/workflows/artifacts-remove.yml@main
36+
secrets: inherit
37+

.github/workflows/manual.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/build-assets/*
2+
!/build-assets/.empty
3+

CHANGELOG.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
## 2.6-1.5-8.0.0 2025-11-13 <dave at tiredofit dot ca>
2+
3+
### Changed
4+
- Switch to nfrastack/openldap base image
5+
- FusionDirectory Schemas 1.5
6+
- FusionDirectory Plugin Schemas 1.5
7+
- FusionDirectory Integrator Version 1.2
8+
- FusionDirectory Tools 1.2
9+
- PHP 7.4.33 (for above tool execution)
10+
111
## 2.6-1.4-7.7.99 2025-11-09 <dave at tiredofit dot ca>
212

313
Add EOL notice and deprecate image
@@ -337,7 +347,7 @@ Add EOL notice and deprecate image
337347
### Added
338348
- Add support for Sinaps Plugin
339349
- Add Secrets Support
340-
350+
341351
### Changed
342352
- Fix AutoFS Plugin
343353
- Fix Nagios Plugin
@@ -382,7 +392,7 @@ Add EOL notice and deprecate image
382392

383393
* Rebase from new tiredofit/openldap image based on Alpine
384394
* Added Individual Schema Application
385-
* Added Reapplication of Schemas
395+
* Added Reapplication of Schemas
386396

387397
## 5.3 2018-06-12 <dave at tiredofit dot ca>
388398

@@ -451,7 +461,7 @@ Add EOL notice and deprecate image
451461
- fusiondirectory-plugin-webservice-schema
452462
## 1.0 2017-01-03 <dave at tiredofit dot ca>
453463

454-
* Initial Build
464+
* Initial Build
455465
* Fusion Directory 1.0.17
456466
* Fusion Directory Schema's Included
457467
- fusiondirectory-schema

Containerfile

Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
# SPDX-FileCopyrightText: © 2025 Nfrastack <code@nfrastack.com>
2+
#
3+
# SPDX-License-Identifier: MIT
4+
5+
ARG \
6+
BASE_IMAGE
7+
8+
FROM ${BASE_IMAGE}
9+
10+
LABEL \
11+
org.opencontainers.image.title="OpenLDAP w/FusionDirectory" \
12+
org.opencontainers.image.description="Directory server with FusionDirectory schemas" \
13+
org.opencontainers.image.url="https://hub.docker.com/r/nfrastack/openldap-fusiondirectory" \
14+
org.opencontainers.image.documentation="https://github.com/nfrastack/container-openldap-fusiondirectory/blob/main/README.md" \
15+
org.opencontainers.image.source="https://github.com/nfrastack/container-openldap-fusiondirectory.git" \
16+
org.opencontainers.image.authors="Nfrastack <code@nfrastack.com>" \
17+
org.opencontainers.image.vendor="Nfrastack <https://www.nfrastack.com>" \
18+
org.opencontainers.image.licenses="MIT"
19+
20+
COPY CHANGELOG.md /usr/src/container/CHANGELOG.md
21+
COPY LICENSE /usr/src/container/LICENSE
22+
COPY README.md /usr/src/container/README.md
23+
24+
ARG \
25+
FUSIONDIRECTORY_VERSION="fusiondirectory-1.5" \
26+
FUSIONDIRECTORY_REPO_URL="https://github.com/fusiondirectory/fusiondirectory" \
27+
FUSIONDIRECTORY_INTEGRATOR_REPO_URL="https://github.com/fusiondirectory/fusiondirectory-integrator" \
28+
FUSIONDIRECTORY_INTEGRATOR_VERSION="1.2" \
29+
FUSIONDIRECTORY_PLUGINS_VERSION="fusiondirectory-1.5" \
30+
FUSIONDIRECTORY_PLUGINS_REPO_URL="https://github.com/fusiondirectory/fusiondirectory-plugins" \
31+
FUSIONDIRECTORY_TOOLS_VERSION="1.2" \
32+
FUSIONDIRECTORY_TOOLS_REPO_URL="https://github.com/fusiondirectory/fusiondirectory-tools" \
33+
PHP_VERSION="php-7.4.33" \
34+
PHP_REPO_URL="https://github.com/php/php-src"
35+
36+
ENV \
37+
IMAGE_NAME="nfrastack/openldap-fusiondirectory" \
38+
IMAGE_REPO_URL="https://github.com/nfrastack/container-openldap-fusiondirectory/"
39+
40+
RUN echo "" && \
41+
OPENLDAP_FUSIONDIRECTORY_BUILD_DEPS_ALPINE=" \
42+
git \
43+
" && \
44+
OPENLDAP_FUSIONDIRECTORY_RUN_DEPS_ALPINE=" \
45+
" && \
46+
PHP_BUILD_DEPS_ALPINE=" \
47+
autoconf \
48+
automake \
49+
bison \
50+
build-base \
51+
cyrus-sasl-dev \
52+
libevent-dev \
53+
libtool \
54+
linux-headers \
55+
musl-dev \
56+
openssl-dev \
57+
re2c \
58+
" && \
59+
PHP_RUN_DEPS_ALPINE=" \
60+
cyrus-sasl \
61+
libevent \
62+
#libxml2 \
63+
openssl \
64+
" && \
65+
source /container/base/functions/container/build && \
66+
container_build_log image && \
67+
package update && \
68+
package upgrade && \
69+
package install \
70+
PHP_BUILD_DEPS \
71+
PHP_RUN_DEPS \
72+
&& \
73+
clone_git_repo "${PHP_REPO_URL}" "${PHP_VERSION}" /usr/src/php && \
74+
curl -ssL https://gitlab.alpinelinux.org/alpine/aports/-/raw/3.19-stable/community/php81/fix-lfs64.patch?ref_type=heads -o /usr/src/php/fix-lfs64.patch && \
75+
patch -d /usr/src/php -p1 < /usr/src/php/fix-lfs64.patch && \
76+
./buildconf --force && \
77+
./configure \
78+
--prefix=/usr/local/php \
79+
--disable-all \
80+
--disable-cgi \
81+
--enable-cli \
82+
--disable-fpm \
83+
--disable-phpdbg \
84+
--enable-posix \
85+
--with-ldap \
86+
--with-ldap-sasl=/usr/include/sasl \
87+
&& \
88+
make -j "$(nproc)" && \
89+
make install && \
90+
ln -s /usr/local/php/bin/php /usr/bin/php && \
91+
container_build_log add "PHP" "${PHP_VERSION}" "${PHP_REPO_URL}" && \
92+
\
93+
package install \
94+
OPENLDAP_FUSIONDIRECTORY_BUILD_DEPS \
95+
OPENLDAP_FUSIONDIRECTORY_RUN_DEPS \
96+
&& \
97+
clone_git_repo "${FUSIONDIRECTORY_INTEGRATOR_REPO_URL}" "${FUSIONDIRECTORY_INTEGRATOR_VERSION}" && \
98+
mkdir -p /usr/share/php/FusionDirectory/ && \
99+
cp -R "${GIT_REPO_SRC_FUSIONDIRECTORY_INTEGRATOR%/}"/src/* /usr/share/php/FusionDirectory && \
100+
container_build_log add "FusionDirectory Integrator" "${FUSIONDIRECTORY_INTEGRATOR_VERSION}" "${FUSIONDIRECTORY_INTEGRATOR_REPO_URL}"&& \
101+
clone_git_repo "${FUSIONDIRECTORY_TOOLS_REPO_URL}" "${FUSIONDIRECTORY_TOOLS_VERSION}" && \
102+
cp -aR "${GIT_REPO_SRC_FUSIONDIRECTORY_TOOLS%/}"/bin/* /usr/local/bin && \
103+
cp -aR "${GIT_REPO_SRC_FUSIONDIRECTORY_TOOLS%/}"/src/FusionDirectory/Tools /usr/share/php/FusionDirectory/FusionDirectory/ && \
104+
container_build_log add "FusionDirectory Tools" "${FUSIONDIRECTORY_TOOLS_VERSION}" "${FUSIONDIRECTORY_TOOLS_REPO_URL}" && \
105+
clone_git_repo "${FUSIONDIRECTORY_REPO_URL}" "${FUSIONDIRECTORY_VERSION}" /usr/src/fusiondirectory && \
106+
container_build_log add "FusionDirectory Schemas" "${FUSIONDIRECTORY_VERSION}" "${FUSIONDIRECTORY_REPO_URL}" && \
107+
clone_git_repo "${FUSIONDIRECTORY_PLUGINS_REPO_URL}" "${FUSIONDIRECTORY_PLUGINS_VERSION}" /usr/src/fusiondirectory-plugins && \
108+
container_build_log add "FusionDirectory Plugins Schemas" "${FUSIONDIRECTORY_PLUGINS_VERSION}" "${FUSIONDIRECTORY_PLUGINS_REPO_URL}" && \
109+
clone_git_repo https://github.com/tiredofit/fusiondirectory-plugin-kopano main /usr/src/fusiondirectory-plugin-kopano && \
110+
cp -R /usr/src/fusiondirectory-plugin-kopano/kopano "${GIT_REPO_SRC_FUSIONDIRECTORY_PLUGINS%/}" && \
111+
container_build_log add "FusionDirectory Kopano Plugin Schema" "main" "https://github.com/tiredofit/fusiondirectory-plugin-kopano" && \
112+
clone_git_repo https://github.com/slangdaddy/fusiondirectory-plugin-nextcloud master /usr/src/fusiondirectory-plugin-nextcloud && \
113+
rm -rf /usr/src/fusiondirectory-plugin-nextcloud/src/DEBIAN && \
114+
mkdir -p "${GIT_REPO_SRC_FUSIONDIRECTORY_PLUGINS%/}"/nextcloud && \
115+
cp -R /usr/src/fusiondirectory-plugin-nextcloud/src/* "${GIT_REPO_SRC_FUSIONDIRECTORY_PLUGINS%/}"/nextcloud/ && \
116+
container_build_log add "FusionDirectory Nextcloud Plugin Schema" "master" "https://github.com/slangdaddy/fusiondirectory-plugin-nextcloud" && \
117+
clone_git_repo https://github.com/gallak/fusiondirectory-plugins-seafile master /usr/src/fusiondirectory-plugins-seafile && \
118+
mkdir -p "${GIT_REPO_SRC_FUSIONDIRECTORY_PLUGINS%/}"/seafile && \
119+
cp -R /usr/src/fusiondirectory-plugins-seafile/* "${GIT_REPO_SRC_FUSIONDIRECTORY_PLUGINS%/}"/seafile/ && \
120+
container_build_log add "FusionDirectory Seafile Plugin Schema" "main" "https://github.com/gallak/fusiondirectory-plugins-seafile" && \
121+
mkdir -p /etc/openldap/schema/fusiondirectory && \
122+
rm -rf /usr/src/fusiondirectory/contrib/openldap/rfc2307bis.schema && \
123+
#cp "${GIT_REPO_SRC_FUSIONDIRECTORY%/}"/contrib/bin/fusiondirectory-insert-schema /usr/local/bin && \
124+
cp -R \
125+
"${GIT_REPO_SRC_FUSIONDIRECTORY%/}"/contrib/openldap/*.schema \
126+
"${GIT_REPO_SRC_FUSIONDIRECTORY_PLUGINS%/}"/*/contrib/openldap/*.schema \
127+
/etc/openldap/schema/fusiondirectory && \
128+
\
129+
#sed -i -e "s|/etc/ldap/schema|/etc/openldap/schema|g" /usr/local/bin/fusiondirectory-insert-schema && \
130+
#chmod +x /usr/local/bin/fusiondirectory-insert-schema && \
131+
package remove \
132+
OPENLDAP_FUSIONDIRECTORY_BUILD_DEPS \
133+
PHP_BUILD_DEPS \
134+
&& \
135+
package cleanup
136+
137+
COPY rootfs /

Dockerfile

Lines changed: 0 additions & 50 deletions
This file was deleted.

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2021 Dave Conroy
3+
Copyright (c) 2025 Nfrastack
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)