mart-w/kanidm
1
0
Fork 0
mirror of https://github.com/kanidm/kanidm.git synced 2025-02-23 12:37:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Trying to fix the (current) container build failures (#2021)

Browse source 
* fixing containers again
This commit is contained in:
James Hodgkinson 2023-08-23 14:42:19 +10:00 committed by GitHub
parent def4420c4c
commit 753ef82a4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
rlm_python/Dockerfile
View file

@ -1,16 +1,17 @@
ARG BASE_IMAGE=opensuse/tumbleweed:latest ARG BASE_IMAGE=opensuse/tumbleweed:latest
FROM ${BASE_IMAGE} AS repos # FROM ${BASE_IMAGE} as repos
FROM ${BASE_IMAGE}
ADD ../scripts/zypper_fixing.sh /zypper_fixing.sh ADD ../scripts/zypper_fixing.sh /zypper_fixing.sh
RUN --mount=type=cache,id=zypp,target=/var/cache/zypp /zypper_fixing.sh RUN --mount=type=cache,id=zypp,target=/var/cache/zypp /zypper_fixing.sh
# ====================== # ======================
FROM repos # FROM repos
EXPOSE 1812 1813
ARG RADIUS_USER=radiusd ARG RADIUS_USER=radiusd
EXPOSE 1812 1813
ENV KANIDM_CONFIG_FILE="/data/kanidm"
RUN \ RUN --mount=type=cache,id=zypp,target=/var/cache/zypp zypper install -y \
--mount=type=cache,id=zypp,target=/var/cache/zypp \
zypper install -y \
freeradius-client \ freeradius-client \
freeradius-server \ freeradius-server \
freeradius-server-python3 \ freeradius-server-python3 \
@ -52,11 +53,14 @@ RUN mkdir -p /pkg/pykanidm/
COPY pykanidm/ /pkg/pykanidm/ COPY pykanidm/ /pkg/pykanidm/
# install the package and its dependencies # install the package and its dependencies
RUN python3 -m pip install --no-cache-dir --no-warn-script-location /pkg/pykanidm RUN python3 -m pip install \
--break-system-packages \
--no-cache-dir \
--no-warn-script-location \
/pkg/pykanidm
COPY rlm_python/radius_entrypoint.py /radius_entrypoint.py COPY rlm_python/radius_entrypoint.py /radius_entrypoint.py
ENV KANIDM_CONFIG_FILE="/data/kanidm"
RUN chmod a+r /etc/raddb/certs/ -R RUN chmod a+r /etc/raddb/certs/ -R
USER $RADIUS_USER USER $RADIUS_USER

14
tools/Dockerfile
View file

@ -48,7 +48,11 @@ RUN \
cargo build -p kanidm-ipa-sync ${KANIDM_BUILD_OPTIONS} \ cargo build -p kanidm-ipa-sync ${KANIDM_BUILD_OPTIONS} \
--target-dir="/usr/src/kanidm/target/" \ --target-dir="/usr/src/kanidm/target/" \
--features="${KANIDM_FEATURES}" \ --features="${KANIDM_FEATURES}" \
--release && \ --release && \
cargo build -p kanidm-ldap-sync ${KANIDM_BUILD_OPTIONS} \
--target-dir="/usr/src/kanidm/target/" \
--features="${KANIDM_FEATURES}" \
--release && \
sccache -s sccache -s
# == Construct the tools container # == Construct the tools container
@ -60,18 +64,16 @@ RUN \
--mount=type=cache,id=zypp,target=/var/cache/zypp \ --mount=type=cache,id=zypp,target=/var/cache/zypp \
zypper install -y \ zypper install -y \
timezone \ timezone \
busybox-adduser \
openssl-3 openssl-3
COPY --from=builder /usr/src/kanidm/target/release/kanidm /sbin/ COPY --from=builder /usr/src/kanidm/target/release/kanidm /sbin/
COPY --from=builder /usr/src/kanidm/target/release/kanidm-ipa-sync /sbin/ COPY --from=builder /usr/src/kanidm/target/release/kanidm-ipa-sync /sbin/
COPY --from=builder /usr/src/kanidm/target/release/kanidm-ldap-sync /sbin/
RUN chmod +x /sbin/kanidm RUN chmod +x /sbin/kanidm
RUN chmod +x /sbin/kanidm-ipa-sync RUN chmod +x /sbin/kanidm-ipa-sync
RUN chmod +x /sbin/kanidm-ldap-sync
RUN adduser -D -H kanidm && \ RUN mkdir /etc/kanidm && \
mkdir /etc/kanidm && \
touch /etc/kanidm/config touch /etc/kanidm/config
USER kanidm
CMD [ "/sbin/kanidm", "-h" ] CMD [ "/sbin/kanidm", "-h" ]