fix ubuntu version, integration, flask installation

dolevf · Nov 26, 2024 · 7aa20cc · 7aa20cc
1 parent 09a1f6e
commit 7aa20cc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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