From 7aa20ccca54b3d9a5ef0ca524880274c7a529568 Mon Sep 17 00:00:00 2001 From: Dolev Farhi Date: Tue, 26 Nov 2024 18:21:43 -0500 Subject: [PATCH] fix ubuntu version, integration, flask installation --- lab/machines/Dockerfile-base | 2 +- lab/machines/c-db-01/Dockerfile | 2 +- lab/machines/p-jumpbox-01/Dockerfile | 3 +++ lab/machines/p-web-01/Dockerfile | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lab/machines/Dockerfile-base b/lab/machines/Dockerfile-base index 1c9d973..fdf5c35 100644 --- a/lab/machines/Dockerfile-base +++ b/lab/machines/Dockerfile-base @@ -1,4 +1,4 @@ -FROM ubuntu:23.04 +FROM ubuntu:24.04 # Add Default Users RUN useradd -m -s /bin/bash jmartinez diff --git a/lab/machines/c-db-01/Dockerfile b/lab/machines/c-db-01/Dockerfile index adf4338..10593d1 100644 --- a/lab/machines/c-db-01/Dockerfile +++ b/lab/machines/c-db-01/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:23.04 +FROM ubuntu:24.04 # Metadata LABEL name="c-db-01" diff --git a/lab/machines/p-jumpbox-01/Dockerfile b/lab/machines/p-jumpbox-01/Dockerfile index ae763ed..b6e8856 100644 --- a/lab/machines/p-jumpbox-01/Dockerfile +++ b/lab/machines/p-jumpbox-01/Dockerfile @@ -25,6 +25,9 @@ COPY files/backup-user-sudo-config /etc/sudoers.d/backup-user-sudo-config # Grant sudo access to jmartinez user COPY files/jmartinez-user-sudo-config /etc/sudoers.d/jmartinez-user-sudo-config +# Setup permissions +RUN chmod 755 /etc/sudoers.d/*-user-sudo-config + # Create the data and scripts directory RUN mkdir scripts RUN mkdir -p /data/backup diff --git a/lab/machines/p-web-01/Dockerfile b/lab/machines/p-web-01/Dockerfile index 0553e7c..54ba2a3 100644 --- a/lab/machines/p-web-01/Dockerfile +++ b/lab/machines/p-web-01/Dockerfile @@ -16,8 +16,8 @@ RUN apt-get install -y \ python3 \ python3-pip \ iptables \ - gnupg -RUN pip3 install flask --break-system-packages + gnupg \ + python3-flask # Copy Files to Lab WORKDIR /app