Add acl and cups packages, remove not used packages.
Some checks failed
continuous-integration/drone/push Build is failing

This commit is contained in:
2022-12-14 21:58:34 +01:00
parent 26fc5dadff
commit fbde49997a
3 changed files with 15 additions and 10 deletions

View File

@@ -23,12 +23,13 @@ ENV DEBIAN_FRONTEND noninteractive
RUN apt-get -y update && \ RUN apt-get -y update && \
apt-get -yqq --no-install-recommends install \ apt-get -yqq --no-install-recommends install \
# resolvconf \ # resolvconf \
dnsutils \ # dnsutils \
vim \ # vim \
nano \ nano \
# crudini \ # crudini \
dbus \ # dbus \
realmd \ # realmd \
acl
krb5-user \ krb5-user \
libpam-krb5 \ libpam-krb5 \
adcli \ adcli \
@@ -50,7 +51,8 @@ RUN apt-get -y update && \
libnss-sss \ libnss-sss \
libpam-sss \ libpam-sss \
adcli \ adcli \
supervisor && \ supervisor \
cups && \
apt-get clean && \ apt-get clean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
systemctl enable sssd && \ systemctl enable sssd && \
@@ -65,6 +67,8 @@ COPY entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh RUN chmod +x /entrypoint.sh
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
VOLUME /etc/samba /var/lib/samba
EXPOSE 137 138 139 445 EXPOSE 137 138 139 445
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]

View File

@@ -15,8 +15,8 @@ if [ ! -f /etc/timezone ] && [ ! -z "$TZ" ]; then
echo $TZ >/etc/timezone echo $TZ >/etc/timezone
fi fi
echo " Starting system message bus" #echo " Starting system message bus"
/etc/init.d/dbus start #/etc/init.d/dbus start
if [ ! -f /etc/samba/krb5.keytab ]; then if [ ! -f /etc/samba/krb5.keytab ]; then
if [ ! -f /run/secrets/$ADMIN_PASSWORD_SECRET ]; then if [ ! -f /run/secrets/$ADMIN_PASSWORD_SECRET ]; then
@@ -26,7 +26,6 @@ if [ ! -f /etc/samba/krb5.keytab ]; then
ADMIN_PASSWORD=$(cat /run/secrets/$ADMIN_PASSWORD_SECRET) ADMIN_PASSWORD=$(cat /run/secrets/$ADMIN_PASSWORD_SECRET)
rm -f /etc/samba/smb.conf /etc/krb5.conf rm -f /etc/samba/smb.conf /etc/krb5.conf
mkdir -p /var/lib/samba/private
# realm join is broken as it requires --privileged but difficult to add for swarm # realm join is broken as it requires --privileged but difficult to add for swarm
# so it can execute /usr/sbin/adcli. Therefore we execute it directly and create # so it can execute /usr/sbin/adcli. Therefore we execute it directly and create
@@ -112,6 +111,8 @@ if [ ! -f /var/lib/samba/private/secrets.tdb ]; then
fi fi
ADMIN_PASSWORD=$(cat /run/secrets/$ADMIN_PASSWORD_SECRET) ADMIN_PASSWORD=$(cat /run/secrets/$ADMIN_PASSWORD_SECRET)
echo "Joining domain using net ads"
mkdir -p /var/lib/samba/private
net ads join -U"$ADMIN_ACCOUNT"%"$ADMIN_PASSWORD" net ads join -U"$ADMIN_ACCOUNT"%"$ADMIN_PASSWORD"
fi fi

View File

@@ -3,7 +3,7 @@ nodaemon=true
loglevel=info loglevel=info
[program:smbd] [program:smbd]
command=/usr/sbin/smbd --interactive command=/usr/sbin/smbd --foreground
redirect_stderr=true redirect_stderr=true
stdout_logfile=/dev/stdout stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0 stdout_logfile_maxbytes=0
@@ -11,7 +11,7 @@ stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0 stderr_logfile_maxbytes=0
[program:nmbd] [program:nmbd]
command=/usr/sbin/nmbd --interactive command=/usr/sbin/nmbd --foreground
redirect_stderr=true redirect_stderr=true
[program:winbind] [program:winbind]