Upgrade tu ubuntu:plucky. Prometheus metrics
All checks were successful
continuous-integration/drone Build is passing
All checks were successful
continuous-integration/drone Build is passing
This commit is contained in:
17
Dockerfile
17
Dockerfile
@@ -1,5 +1,5 @@
|
|||||||
#FROM debian:bookworm
|
#FROM debian:bookworm
|
||||||
FROM ubuntu:mantic
|
FROM ubuntu:plucky
|
||||||
|
|
||||||
MAINTAINER Roman VANICEK <roman.vanicek@ivasoft.cz>
|
MAINTAINER Roman VANICEK <roman.vanicek@ivasoft.cz>
|
||||||
|
|
||||||
@@ -15,11 +15,19 @@ ENV ADMIN_PASSWORD_SECRET=samba-admin-password \
|
|||||||
TZ=UTC \
|
TZ=UTC \
|
||||||
WINBIND_USE_DEFAULT_DOMAIN=yes \
|
WINBIND_USE_DEFAULT_DOMAIN=yes \
|
||||||
WORKGROUP=AD \
|
WORKGROUP=AD \
|
||||||
CUPS_TRUSTED_PROXY=
|
CUPS_TRUSTED_PROXY= \
|
||||||
|
EXPORTER_LISTEN_ADDRESS=127.0.0.1:9922
|
||||||
|
|
||||||
COPY *.sh /
|
COPY *.sh /
|
||||||
|
COPY imker-ubuntu-samba-exporter-ppa-plucky.sources /etc/apt/sources.list.d/
|
||||||
|
|
||||||
RUN apt-get -y update && \
|
RUN apt-get -y update && \
|
||||||
|
# HACK: ubuntu:plucky has broken ca-certificates and apt-get update fails for samba-exporter repository
|
||||||
|
DEBIAN_FRONTEND=noninteractive apt-get -yqq --no-install-recommends install ca-certificates && \
|
||||||
|
# HACK: samba-exporter needs adduser and systemctl for its postinstall script
|
||||||
|
DEBIAN_FRONTEND=noninteractive apt-get -yqq --no-install-recommends install adduser systemd && \
|
||||||
|
echo '#!/bin/sh' > /usr/bin/systemctl && chmod +x /usr/bin/systemctl && \
|
||||||
|
apt-get -y update && \
|
||||||
DEBIAN_FRONTEND=noninteractive apt-get -yqq --no-install-recommends install \
|
DEBIAN_FRONTEND=noninteractive apt-get -yqq --no-install-recommends install \
|
||||||
nano \
|
nano \
|
||||||
tzdata \
|
tzdata \
|
||||||
@@ -39,9 +47,12 @@ RUN apt-get -y update && \
|
|||||||
attr \
|
attr \
|
||||||
libpam-mount \
|
libpam-mount \
|
||||||
supervisor \
|
supervisor \
|
||||||
cups && \
|
cups \
|
||||||
|
samba-exporter && \
|
||||||
apt-get clean && \
|
apt-get clean && \
|
||||||
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
|
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
|
||||||
|
# HACK: samba-exporter
|
||||||
|
rm /usr/bin/systemctl && \
|
||||||
\
|
\
|
||||||
chmod +x /entrypoint.sh && \
|
chmod +x /entrypoint.sh && \
|
||||||
chmod +x /persistCups.sh && \
|
chmod +x /persistCups.sh && \
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ DOMAIN=$(echo "$REALM" | tr [A-Z] [a-z])
|
|||||||
|
|
||||||
if [ ! -f /etc/timezone ] && [ ! -z "$TZ" ]; then
|
if [ ! -f /etc/timezone ] && [ ! -z "$TZ" ]; then
|
||||||
echo 'Set timezone'
|
echo 'Set timezone'
|
||||||
|
rm /etc/localtime
|
||||||
cp /usr/share/zoneinfo/$TZ /etc/localtime
|
cp /usr/share/zoneinfo/$TZ /etc/localtime
|
||||||
echo $TZ >/etc/timezone
|
echo $TZ >/etc/timezone
|
||||||
fi
|
fi
|
||||||
|
|||||||
33
imker-ubuntu-samba-exporter-ppa-plucky.sources
Normal file
33
imker-ubuntu-samba-exporter-ppa-plucky.sources
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
Types: deb
|
||||||
|
URIs: https://ppa.launchpadcontent.net/imker/samba-exporter-ppa/ubuntu/
|
||||||
|
Suites: plucky
|
||||||
|
Components: main
|
||||||
|
Signed-By:
|
||||||
|
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||||
|
.
|
||||||
|
mQINBGEqM14BEADfx2aT0bCJE1AsUViNXRCHg8M4scLnj5VB+IwcuP9v8RSaypVp
|
||||||
|
eZTrjgsuvwh/tuT7gpIFh23xEIiTrPREbbero+j4Jm55SR2bkDkuR64hnPcfdFWT
|
||||||
|
1cMbGimoyG3S+EZpvjhilYbH2iMME24IxlgOLAzU8QM3Em6qWhiMQkF0SKACC5aj
|
||||||
|
IaE7qzx0SmBFud11M7YinDmnuoLYHqh64SRZ4xhY1FgVSXCUiokf+bNoA6wU30Qo
|
||||||
|
unadpWQ1nP+XxvpeZw6pERE/fwFadG13febbwwWKuZKWMw3ubILvqaeA23ZjutLn
|
||||||
|
azOHXTiIhmK5cMRs1EeDdNtkAafi3iJ3dLu8LLJEoSGEDAXIvgZrQlOb2uo1gIOh
|
||||||
|
jZXcJ4BubFhQI+4tpWTktTqEsOIE/SOFXo+OAPpkfHUttMwh+hXyQBLm0Qc6zdFj
|
||||||
|
fGR0lBLFhbueN/1L9YQX9+NK3k/o3WJvVmWUlZZ3HZuqNS6JVb8ZgQvJuTM8TUxz
|
||||||
|
U4R44fefMyMGSuPBQyOEqM1yIMvWpa6FGUd2ojvCxAzi2obeN5xkXHK8VF7tmrM2
|
||||||
|
/usF81rOIndNIdZ0K7Ng87EiZw8vDuJnTYmqeu+BzcTVpfOjEVryy8yBgeHbTg/6
|
||||||
|
mhUdwfefj4kw54q1+DjonVYjjrACLuhwE7nogNtXpFenQIB04afGsEdXBQARAQAB
|
||||||
|
tBdMYXVuY2hwYWQgUFBBIGZvciBpbWtlcokCTgQTAQoAOBYhBChvKQRVqhia1Bhp
|
||||||
|
70YoMeSIgJvnBQJhKjNeAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEEYo
|
||||||
|
MeSIgJvnvGsQAJdFPl/SOclIbbsUefJtRl/W30zXx9oTKNGmYCLzctikmxXqbPV7
|
||||||
|
dZ+4RCcSkQlzbFz1+9is3JAHftkxWSaVvYTrmJ/JTRPLOc01XOR/jABO+W1+Z3vs
|
||||||
|
V+rkIQk+Lyzk5h7+6iIBlX9dYkv8o5KvoXUTD54ZGA3z3FejsnABFE+OltY93ic3
|
||||||
|
WSsRC0VOdHpAbSpPa2c0XTI2KukeUelYAXQd1uSK8Eyg3jZA3tDKhvZtEYVPbLYr
|
||||||
|
t7g+lQqNXLR5lgdjIovYB5C5qi1dNjJ4uEs49VUr9ShwP0nywmTPOh0B+wwj02VT
|
||||||
|
OAdxY/CIB2yvoQ9ziZL6c/NvSgMz+AJpKorjLMYydLaLonX9CDZ1Yk9KUshJtpus
|
||||||
|
jH4z4TuZGuNurIxMyNh9BPqnxTseLiNIolt1wFRpiRk9jxNgX+M6Ih0q+i1wJchS
|
||||||
|
H6mq1ztxznbFp4IWrZR2cOjbKffFeuLAG4FvCYciK0lW6gyy0PWiBhrlv8Jzt7O8
|
||||||
|
fLdWBUBjz9lRKd8TsY7TWxq8bIZSMgof8QpJk51eBohIKlmpYNFGJYbnan+tzRyA
|
||||||
|
HaT9M53kbf6CHWKyWvVNyS2p6rUhzWoFpBvKk0od/0EfVTIU+IR0VcdOpSaWc+Zm
|
||||||
|
ugs1ca6DIE73DN7QVhqeBiYP9bMGR5qk5QqWZ31iE+j+2CIgps6cny8L
|
||||||
|
=vgc4
|
||||||
|
-----END PGP PUBLIC KEY BLOCK-----
|
||||||
@@ -35,3 +35,11 @@ redirect_stderr=true
|
|||||||
command=/usr/sbin/cron -f
|
command=/usr/sbin/cron -f
|
||||||
redirect_stderr=true
|
redirect_stderr=true
|
||||||
|
|
||||||
|
[program:samba_exporter]
|
||||||
|
environment=LANG="C",LC_TIME="c.utf-8",LC_NUMERIC="c.UTF-8"
|
||||||
|
command=/usr/bin/samba_exporter -web.listen-address=%(ENV_EXPORTER_LISTEN_ADDRESS)s
|
||||||
|
|
||||||
|
[program:samba_statusd]
|
||||||
|
environment=LANG="C",LC_TIME="c.utf-8",LC_NUMERIC="c.UTF-8"
|
||||||
|
commnand=/usr/bin/start_samba_statusd
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user