From d0653aaa7189259ad56c9a2e026354dd631093f9 Mon Sep 17 00:00:00 2001 From: Leandro Dalla Nora Date: Fri, 21 Jun 2024 20:32:38 +0000 Subject: [PATCH 1/2] Ubuntu 18.04 updated for ubuntu 24.04 --- Dockerfile.master | 18 +++++++----------- Dockerfile.minion | 17 ++++++----------- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/Dockerfile.master b/Dockerfile.master index d2d5051..039acec 100644 --- a/Dockerfile.master +++ b/Dockerfile.master @@ -1,18 +1,14 @@ -FROM ubuntu:18.04 +FROM ubuntu:24.04 MAINTAINER tim@cyface.com ENV APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update -y -RUN apt-get install apt-utils wget gnupg -y -RUN wget -q https://repo.saltstack.com/py3/ubuntu/18.04/amd64/latest/SALTSTACK-GPG-KEY.pub && \ - apt-key add SALTSTACK-GPG-KEY.pub && \ - rm SALTSTACK-GPG-KEY.pub -RUN echo "deb http://repo.saltstack.com/py3/ubuntu/18.04/amd64/latest bionic main" > /etc/apt/sources.list.d/saltstack.list -RUN apt-get update -y && \ - apt-get install salt-master salt-minion salt-ssh salt-syndic salt-cloud salt-api -y && \ - apt-get clean all +RUN apt-get update; apt-get install -y curl +RUN curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg https://repo.saltproject.io/salt/py3/ubuntu/24.04/amd64/SALT-PROJECT-GPG-PUBKEY-2023.gpg +RUN echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] https://repo.saltproject.io/salt/py3/ubuntu/24.04/amd64/latest noble main" | tee /etc/apt/sources.list.d/salt.list + +RUN apt-get update; apt-get install salt-master salt-ssh salt-syndic salt-cloud salt-api -y; apt-get clean all RUN sed -i "s|#auto_accept: False|auto_accept: True|g" /etc/salt/master ENTRYPOINT ["salt-master", "-l", "debug"] + diff --git a/Dockerfile.minion b/Dockerfile.minion index 9e7862c..6e7d24e 100644 --- a/Dockerfile.minion +++ b/Dockerfile.minion @@ -1,17 +1,12 @@ -FROM ubuntu:18.04 +FROM ubuntu:24.04 MAINTAINER tim@cyface.com ENV APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update -y -RUN apt-get install apt-utils wget gnupg -y -RUN wget -q https://repo.saltstack.com/py3/ubuntu/18.04/amd64/latest/SALTSTACK-GPG-KEY.pub && \ - apt-key add SALTSTACK-GPG-KEY.pub && \ - rm SALTSTACK-GPG-KEY.pub -RUN echo "deb http://repo.saltstack.com/py3/ubuntu/18.04/amd64/latest bionic main" > /etc/apt/sources.list.d/saltstack.list -RUN apt-get update -y && \ - apt-get install salt-minion salt-ssh -y && \ - apt-get clean all +RUN apt-get update; apt-get install -y curl +RUN curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg https://repo.saltproject.io/salt/py3/ubuntu/24.04/amd64/SALT-PROJECT-GPG-PUBKEY-2023.gpg +RUN echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] https://repo.saltproject.io/salt/py3/ubuntu/24.04/amd64/latest noble main" | tee /etc/apt/sources.list.d/salt.list + +RUN apt-get update; apt-get install salt-minion salt-ssh -y; apt-get clean all RUN sed -i "s|#master: salt|master: salt-master|g" /etc/salt/minion From 5c01799fc7c8139a83827ed77d504b16c9156487 Mon Sep 17 00:00:00 2001 From: Leandro Dalla Nora Date: Tue, 16 Jul 2024 10:57:23 -0300 Subject: [PATCH 2/2] =?UTF-8?q?Adi=C3=A7=C3=A3o=20de=20volumes=20no=20dock?= =?UTF-8?q?er=20compose?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile.master | 4 ++-- Dockerfile.minion | 2 +- docker-compose.yml | 23 +++++++++++++++++++++++ 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/Dockerfile.master b/Dockerfile.master index 039acec..c5597fe 100644 --- a/Dockerfile.master +++ b/Dockerfile.master @@ -1,12 +1,12 @@ FROM ubuntu:24.04 -MAINTAINER tim@cyface.com +# MAINTAINER tim@cyface.com ENV APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 RUN apt-get update; apt-get install -y curl RUN curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg https://repo.saltproject.io/salt/py3/ubuntu/24.04/amd64/SALT-PROJECT-GPG-PUBKEY-2023.gpg RUN echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] https://repo.saltproject.io/salt/py3/ubuntu/24.04/amd64/latest noble main" | tee /etc/apt/sources.list.d/salt.list -RUN apt-get update; apt-get install salt-master salt-ssh salt-syndic salt-cloud salt-api -y; apt-get clean all +RUN apt-get update; apt-get install salt-master salt-ssh salt-syndic salt-cloud salt-api vim -y; apt-get clean all RUN sed -i "s|#auto_accept: False|auto_accept: True|g" /etc/salt/master diff --git a/Dockerfile.minion b/Dockerfile.minion index 6e7d24e..59ff4ca 100644 --- a/Dockerfile.minion +++ b/Dockerfile.minion @@ -1,5 +1,5 @@ FROM ubuntu:24.04 -MAINTAINER tim@cyface.com +# MAINTAINER tim@cyface.com ENV APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 RUN apt-get update; apt-get install -y curl diff --git a/docker-compose.yml b/docker-compose.yml index 9aa9e42..e8a88db 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,9 +5,32 @@ services: build: context: . dockerfile: Dockerfile.master + networks: + my-net: + ipv4_address: 10.0.0.200 + volumes: + - my_vol:/etc/salt + salt-minion: build: context: . dockerfile: Dockerfile.minion depends_on: - salt-master + networks: + my-net: + ipv4_address: 10.0.0.201 + +networks: + my-net: + driver: macvlan + driver_opts: + parent: eno1 + ipam: + config: + - subnet: 10.0.0.0/22 + gateway: 10.0.0.1 + +volumes: + my_vol: + driver: local