From 471f2d0bb4597341df19a0ccb6fc3e8758b70c50 Mon Sep 17 00:00:00 2001
From: Astound <kirito@disroot.org>
Date: Sun, 13 Jul 2025 17:55:36 -0500
Subject: [PATCH] update packages

---
 Dockerfile         | 44 ++++++++++++++++++++++++++++++++++++++------
 docker-compose.yml |  1 +
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3bcd79c..87116c3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,12 +22,44 @@ ENV DOCKER_USER=coder \
     HASHED_PASSWORD=undefined
 
 # Base packages
-RUN apt-get update && apt-get install --no-install-recommends -y \
-    bash curl unzip gnupg net-tools tree bash-completion sudo \
-    default-jre jq python3 python3-pip python3-venv virtualenv \
-    siege tar ca-certificates wget git dumb-init nodejs npm \
-    lsb-release iproute2 iptables uidmap dbus fuse3 xz-utils doas passwd \
-    && apt-get clean && rm -rf /var/lib/apt/lists/*
+RUN apt-get update -y && apt-get upgrade -y && apt-get install --no-install-recommends -y \
+    bash \
+    bash-completion \
+    ca-certificates \
+    curl \
+    dbus \
+    default-jre \
+    doas \
+    dumb-init \
+    fuse3 \
+    git \
+    gnupg \
+    iproute2 \
+    iptables \
+    jq \
+    lsb-release \
+    nano \
+    net-tools \
+    nodejs \
+    npm \
+    passwd \
+    python3 \
+    python3-pip \
+    python3-venv \
+    siege \
+    sudo \
+    tar \
+    tree \
+    uidmap \
+    unzip \
+    virtualenv \
+    wget \
+    xz-utils && \
+    curl -fsSL https://aquasecurity.github.io/trivy-repo/deb/public.key | \
+    gpg --dearmor > /usr/share/keyrings/trivy.gpg && \
+    echo "deb [signed-by=/usr/share/keyrings/trivy.gpg] https://aquasecurity.github.io/trivy-repo/deb generic main" > /etc/apt/sources.list.d/trivy.list && \
+    apt-get update -y && apt-get install --no-install-recommends -y trivy && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Docker
 RUN curl -fsSL https://get.docker.com | sh && dockerd --version
diff --git a/docker-compose.yml b/docker-compose.yml
index 86ee739..de8e214 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,6 +6,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
+    privileged: true  # Required for DinD (Docker in Docker)
     ports:
       - "8080:8080"
     env_file: