Skip to content

Commit 2672556

Browse files
erwindonerwindon
authored
Merge pull request #677 from erwindon/update_docker
Docker build fails
2 parents 830a7e7 + 29a5c87 commit 2672556

File tree

6 files changed

+47
-50
lines changed

6 files changed

+47
-50
lines changed

‎docker/dockerfiles/conf/supervisord.conf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
[supervisord]
22
nodaemon=true
3+
user=root
4+
loglevel=warn
35

46
[program:saltmaster]
57
command=/usr/bin/salt-master -l info

‎docker/dockerfiles/dockerfile-saltgui-nginx‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
LABEL maintainer="Erwin Dondorp <saltgui@dondorp.com>"
44
LABEL name=saltgui-nginx
@@ -8,10 +8,6 @@ LABEL version=1.18.0
88
ENV NGINX_VERSION=1.18.0
99
ENV DEBIAN_FRONTEND=noninteractive
1010

11-
# fix ubuntu
12-
# see https://askubuntu.com/questions/1235914/hash-sum-mismatch-error-due-to-identical-sha1-and-md5-but-different-sha256
13-
RUN mkdir /etc/gcrypt && echo all >> /etc/gcrypt/hwf.deny
14-
1511
RUN apt-get update \
1612
# install nginx
1713
&& apt-get install -y nginx=${NGINX_VERSION}* --no-install-recommends \

‎docker/dockerfiles/dockerfile-saltmaster‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
LABEL maintainer="Erwin Dondorp <saltgui@dondorp.com>"
44
LABEL name=salt-master
@@ -8,28 +8,27 @@ LABEL version=3007.1
88
ENV SALT_VERSION=3007.1
99
ENV DEBIAN_FRONTEND=noninteractive
1010

11-
# fix ubuntu
12-
# see https://askubuntu.com/questions/1235914/hash-sum-mismatch-error-due-to-identical-sha1-and-md5-but-different-sha256
13-
RUN mkdir /etc/gcrypt && echo all >> /etc/gcrypt/hwf.deny
14-
15-
# add saltstack repo
16-
RUN apt-get update
17-
RUN apt-get install --yes --no-install-recommends curl ca-certificates gnupg2 net-tools dirmngr
18-
RUN curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg https://repo.saltproject.io/salt/py3/ubuntu/22.04/amd64/SALT-PROJECT-GPG-PUBKEY-2023.gpg
19-
RUN echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] https://repo.saltproject.io/salt/py3/ubuntu/22.04/amd64/minor/${SALT_VERSION} jammy main" > /etc/apt/sources.list.d/salt.list
11+
# make download possible, make encrypted password generation possible
2012
RUN apt-get update
21-
22-
# install salt-master and salt-api
23-
RUN apt-get install salt-master=${SALT_VERSION} salt-api=${SALT_VERSION} --yes --no-install-recommends
13+
RUN apt-get install --yes --no-install-recommends curl openssl adduser
2414

2515
# add a user for the frontend salt:salt
16+
RUN adduser salt
2617
RUN usermod -s /bin/bash -p "$(openssl passwd -1 salt)" salt
2718

19+
# install salt-master with salt-api
20+
# not using repo, so must explicitly do all packages
21+
RUN curl -k -L -o salt-common_${SALT_VERSION}.deb https://packages.broadcom.com/artifactory/saltproject-deb/pool/salt-common_${SALT_VERSION}_amd64.deb
22+
RUN curl -k -L -o salt-api_${SALT_VERSION}.deb https://packages.broadcom.com/artifactory/saltproject-deb/pool/salt-api_${SALT_VERSION}_amd64.deb
23+
RUN curl -k -L -o salt-master_${SALT_VERSION}.deb https://packages.broadcom.com/artifactory/saltproject-deb/pool/salt-master_${SALT_VERSION}_amd64.deb
24+
RUN apt install --yes --no-install-recommends ./salt-common_${SALT_VERSION}.deb ./salt-master_${SALT_VERSION}.deb ./salt-api_${SALT_VERSION}.deb
25+
2826
# install supervisor
29-
RUN apt-get install supervisor --yes --no-install-recommends
27+
# becausewe need to run salt-master and salt-api
28+
RUN apt-get install --yes --no-install-recommends supervisor
3029

3130
# cleanup temporary files
32-
RUN rm -rf /var/lib/apt/lists/* \
31+
RUN rm -rf /var/lib/apt/lists/* *.deb \
3332
&& apt-get --yes autoremove \
3433
&& apt-get clean
3534

@@ -41,4 +40,5 @@ VOLUME ["/pki", "/var/cache/salt", "/var/log/salt"]
4140
EXPOSE 3333 4505 4506
4241

4342
# define main container command
44-
CMD /usr/bin/supervisord
43+
# explicitly mentioning the (default) configuration file saves a warning
44+
CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]

‎docker/dockerfiles/dockerfile-saltminion-centos‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,20 @@ LABEL version=3007.1
88
ENV SALT_VERSION=3007.1
99
ENV DEBIAN_FRONTEND=noninteractive
1010

11-
# add saltstack repo
12-
RUN yum install --assumeyes epel-release curl gnupg2 net-tools
13-
RUN rpm --import https://repo.saltproject.io/salt/py3/redhat/9/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub
14-
RUN curl -fsSL https://repo.saltproject.io/salt/py3/redhat/9/x86_64/minor/3007.1.repo > /etc/yum.repos.d/salt.repo
15-
RUN yum update --assumeyes
11+
# get saltstack software
12+
RUN yum install --assumeyes epel-release curl
1613

1714
# install salt-minion
18-
RUN yum install --assumeyes salt-minion-${SALT_VERSION}
15+
# not using repo, so must explicitly do all packages
16+
RUN yum install --assumeyes https://packages.broadcom.com/artifactory/saltproject-rpm/salt-${SALT_VERSION}-0.x86_64.rpm
17+
RUN yum install --assumeyes https://packages.broadcom.com/artifactory/saltproject-rpm/salt-minion-${SALT_VERSION}-0.x86_64.rpm
1918

2019
# cleanup temporary files
21-
RUN rm -rf /var/lib/yum/* /var/cache/yum \
20+
RUN rm -rf /var/lib/yum/* /var/cache/yum *.rpm \
2221
&& yum clean all
2322

2423
# copy the minion configuration
2524
COPY ./conf/minion /etc/salt/minion
2625

2726
# define main container command
28-
CMD /usr/bin/salt-minion
27+
CMD ["/usr/bin/salt-minion"]

‎docker/dockerfiles/dockerfile-saltminion-debian‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,25 @@ LABEL version=3007.1
88
ENV SALT_VERSION=3007.1
99
ENV DEBIAN_FRONTEND=noninteractive
1010

11-
# add saltstack repo
12-
RUN apt-get update
13-
RUN apt-get install --yes --no-install-recommends curl ca-certificates gnupg2 net-tools dirmngr
14-
RUN curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg https://repo.saltproject.io/salt/py3/debian/12/amd64/SALT-PROJECT-GPG-PUBKEY-2023.gpg
15-
RUN echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] https://repo.saltproject.io/salt/py3/debian/12/amd64/minor/${SALT_VERSION} bookworm main" > /etc/apt/sources.list.d/salt.list
11+
# make download possible
1612
RUN apt-get update
13+
RUN apt-get install --yes --no-install-recommends curl
1714

1815
# install salt-minion
19-
RUN apt-get install salt-minion=${SALT_VERSION} --yes --no-install-recommends
16+
# not using repo, so must explicitly do all packages
17+
RUN curl -k -L -o salt-common_${SALT_VERSION}.deb https://packages.broadcom.com/artifactory/saltproject-deb/pool/salt-common_${SALT_VERSION}_amd64.deb
18+
RUN curl -k -L -o salt-minion_${SALT_VERSION}.deb https://packages.broadcom.com/artifactory/saltproject-deb/pool/salt-minion_${SALT_VERSION}_amd64.deb
19+
RUN apt install --yes --no-install-recommends ./salt-common_${SALT_VERSION}.deb ./salt-minion_${SALT_VERSION}.deb
2020

2121
# cleanup temporary files
22-
RUN rm -rf /var/lib/apt/lists/* \
22+
RUN rm -rf /var/lib/apt/lists/* *.deb \
2323
&& apt-get -y autoremove \
2424
&& apt-get clean
2525

2626
# copy the minion configuration
2727
COPY ./conf/minion /etc/salt/minion
2828

29+
ENV CRYPTOGRAPHY_OPENSSL_NO_LEGACY=true
30+
2931
# define main container command
30-
CMD /usr/bin/salt-minion
32+
CMD ["/usr/bin/salt-minion"]

‎docker/dockerfiles/dockerfile-saltminion-ubuntu‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
LABEL maintainer="Erwin Dondorp <saltgui@dondorp.com>"
44
LABEL name=salt-minion
@@ -8,27 +8,25 @@ LABEL version=3007.1
88
ENV SALT_VERSION=3007.1
99
ENV DEBIAN_FRONTEND=noninteractive
1010

11-
# fix ubuntu
12-
# see https://askubuntu.com/questions/1235914/hash-sum-mismatch-error-due-to-identical-sha1-and-md5-but-different-sha256
13-
RUN mkdir /etc/gcrypt && echo all >> /etc/gcrypt/hwf.deny
14-
15-
# add saltstack repo
16-
RUN apt-get update
17-
RUN apt-get install --yes --no-install-recommends curl ca-certificates gnupg2 net-tools
18-
RUN curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg https://repo.saltproject.io/salt/py3/ubuntu/22.04/amd64/SALT-PROJECT-GPG-PUBKEY-2023.gpg
19-
RUN echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] https://repo.saltproject.io/salt/py3/ubuntu/22.04/amd64/minor/${SALT_VERSION} jammy main" > /etc/apt/sources.list.d/salt.list
11+
# make download possible
2012
RUN apt-get update
13+
RUN apt-get install --yes --no-install-recommends curl
2114

2215
# install salt-minion
23-
RUN apt-get install salt-minion=${SALT_VERSION} --yes --no-install-recommends
16+
# not using repo, so must explicitly do all packages
17+
RUN curl -k -L -o salt-common_${SALT_VERSION}.deb https://packages.broadcom.com/artifactory/saltproject-deb/pool/salt-common_${SALT_VERSION}_amd64.deb
18+
RUN curl -k -L -o salt-minion_${SALT_VERSION}.deb https://packages.broadcom.com/artifactory/saltproject-deb/pool/salt-minion_${SALT_VERSION}_amd64.deb
19+
RUN apt install --yes --no-install-recommends ./salt-common_${SALT_VERSION}.deb ./salt-minion_${SALT_VERSION}.deb
2420

2521
# cleanup temporary files
26-
RUN rm -rf /var/lib/apt/lists/* \
22+
RUN rm -rf /var/lib/apt/lists/* *.deb \
2723
&& apt-get -y autoremove \
2824
&& apt-get clean
2925

3026
# copy the minion configuration
3127
COPY ./conf/minion /etc/salt/minion
3228

29+
ENV CRYPTOGRAPHY_OPENSSL_NO_LEGACY=true
30+
3331
# define main container command
34-
CMD /usr/bin/salt-minion
32+
CMD ["/usr/bin/salt-minion"]

0 commit comments

Comments
 (0)