From 341a5445367095af024cdc5eb89b933a4beb356d Mon Sep 17 00:00:00 2001
From: Michael Gold <goldmichael@gmail.com>
Date: Thu, 13 Mar 2025 01:38:22 +0000
Subject: [PATCH 1/5] feat: add nvidia docker support

---
 .gitignore         |  1 +
 Dockerfile         | 50 ++++++++++++++++++++++++++++++++++++++++++++++
 docker-compose.yml | 21 +++++++++++++++++++
 3 files changed, 72 insertions(+)
 create mode 100644 Dockerfile
 create mode 100644 docker-compose.yml

diff --git a/.gitignore b/.gitignore
index f5a51913..46b76d52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ node_modules
 log.txt
 script/pinokio.json
 __pycache__
+volumes
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..ed48db23
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,50 @@
+# Use the NVIDIA CUDA base image with cuDNN support
+# FROM nvidia/cuda:12.8.0-cudnn-runtime-ubuntu24.04
+FROM nvidia/cuda:12.2.2-base-ubuntu22.04
+
+
+# Install necessary packages
+RUN apt-get update && apt-get install -y \
+    curl \
+    && rm -rf /var/lib/apt/lists/*
+
+
+# Set up X Virtual Framebuffer
+ENV DISPLAY=:99
+RUN Xvfb :99 -screen 0 1920x1080x24 &
+
+# Install nvm
+ENV NVM_DIR /usr/local/nvm
+RUN mkdir -p $NVM_DIR
+ENV NODE_VERSION 22.14.0
+RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash \
+    && . $NVM_DIR/nvm.sh \
+    && nvm install $NODE_VERSION \
+    && nvm use $NODE_VERSION \
+    && nvm alias default $NODE_VERSION \
+    && ln -s $NVM_DIR/versions/node/v$NODE_VERSION/bin/node /usr/local/bin/node \
+    && ln -s $NVM_DIR/versions/node/v$NODE_VERSION/bin/npm /usr/local/bin/npm
+
+
+# Set the working directory
+WORKDIR /app
+
+# Copy package.json and package-lock.json
+COPY package*.json ./
+
+# Install Node.js dependencies
+RUN npm install
+
+# Copy the rest of the application code
+COPY . .
+
+# Expose the port that the application will run on
+EXPOSE 4200
+
+# patch server script to not display in window
+RUN sed -i '1s|^|global.window = global.window \|\| {}; global.window.location = { href: \"http://localhost\" }; \n|' /app/script/index.js
+
+
+
+# Start the application
+CMD ["npm", "start"]
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 00000000..16ed678c
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,21 @@
+services:
+  pinokiod:
+    build: .
+    environment:
+      - PINOKIO_HOME=/app/data
+    ports:
+      - "41999:41999"
+    deploy:
+      resources:
+        reservations:
+          devices:
+            - driver: nvidia
+              count: all
+              capabilities: [gpu]
+    volumes:
+      - ./volumes/home:/root
+
+volumes:
+  pinokio_models:
+    driver: local
+

From 24db64e6ed39074468f71408eb677541d486e40a Mon Sep 17 00:00:00 2001
From: Michael Gold <goldmichael@gmail.com>
Date: Thu, 13 Mar 2025 02:45:08 +0000
Subject: [PATCH 2/5] fix: install libpng

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index ed48db23..c1473373 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,6 +6,8 @@ FROM nvidia/cuda:12.2.2-base-ubuntu22.04
 # Install necessary packages
 RUN apt-get update && apt-get install -y \
     curl \
+    libpng-dev \
+    libglib2.0-0 \
     && rm -rf /var/lib/apt/lists/*
 
 

From 1ea663752be1bfc435b6e3c26783cca351b475c8 Mon Sep 17 00:00:00 2001
From: Michael Gold <goldmichael@gmail.com>
Date: Thu, 13 Mar 2025 02:45:39 +0000
Subject: [PATCH 3/5] fix: set root path

---
 Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index c1473373..5df62799 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -40,6 +40,9 @@ RUN npm install
 # Copy the rest of the application code
 COPY . .
 
+# Create pinokio.json file in the script directory with the home directory set
+RUN echo '{"home": "/root/.pinokio"}' > /app/script/pinokio.json
+
 # Expose the port that the application will run on
 EXPOSE 4200
 

From 625c2045a59df0c2abb25130cfb217f7ef896083 Mon Sep 17 00:00:00 2001
From: Michael Gold <goldmichael@gmail.com>
Date: Fri, 14 Mar 2025 18:56:41 +0000
Subject: [PATCH 4/5] feat: track volumes inside Docker dir

---
 .dockerignore                   |   1 +
 Docker/.bashrc                  | 118 ++++++++++++++++++++++++++++++++
 Dockerfile => Docker/Dockerfile |  37 +++++++---
 docker-compose.yml              |  24 ++++---
 4 files changed, 161 insertions(+), 19 deletions(-)
 create mode 100644 .dockerignore
 create mode 100644 Docker/.bashrc
 rename Dockerfile => Docker/Dockerfile (54%)

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..c9601203
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1 @@
+Docker/volumes
\ No newline at end of file
diff --git a/Docker/.bashrc b/Docker/.bashrc
new file mode 100644
index 00000000..5ae808f1
--- /dev/null
+++ b/Docker/.bashrc
@@ -0,0 +1,118 @@
+# ~/.bashrc: executed by bash(1) for non-login shells.
+# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
+# for examples
+
+# If not running interactively, don't do anything
+[ -z "$PS1" ] && return
+
+# don't put duplicate lines in the history. See bash(1) for more options
+# ... or force ignoredups and ignorespace
+HISTCONTROL=ignoredups:ignorespace
+
+# append to the history file, don't overwrite it
+shopt -s histappend
+
+# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
+HISTSIZE=1000
+HISTFILESIZE=2000
+
+# check the window size after each command and, if necessary,
+# update the values of LINES and COLUMNS.
+shopt -s checkwinsize
+
+# make less more friendly for non-text input files, see lesspipe(1)
+[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
+
+# set variable identifying the chroot you work in (used in the prompt below)
+if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
+    debian_chroot=$(cat /etc/debian_chroot)
+fi
+
+# set a fancy prompt (non-color, unless we know we "want" color)
+case "$TERM" in
+    xterm-color) color_prompt=yes;;
+esac
+
+# uncomment for a colored prompt, if the terminal has the capability; turned
+# off by default to not distract the user: the focus in a terminal window
+# should be on the output of commands, not on the prompt
+#force_color_prompt=yes
+
+if [ -n "$force_color_prompt" ]; then
+    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
+        # We have color support; assume it's compliant with Ecma-48
+        # (ISO/IEC-6429). (Lack of such support is extremely rare, and such
+        # a case would tend to support setf rather than setaf.)
+        color_prompt=yes
+    else
+        color_prompt=
+    fi
+fi
+
+if [ "$color_prompt" = yes ]; then
+    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
+else
+    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
+fi
+unset color_prompt force_color_prompt
+
+# If this is an xterm set the title to user@host:dir
+case "$TERM" in
+xterm*|rxvt*)
+    PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
+    ;;
+*)
+    ;;
+esac
+
+# enable color support of ls and also add handy aliases
+if [ -x /usr/bin/dircolors ]; then
+    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
+    alias ls='ls --color=auto'
+    #alias dir='dir --color=auto'
+    #alias vdir='vdir --color=auto'
+
+    alias grep='grep --color=auto'
+    alias fgrep='fgrep --color=auto'
+    alias egrep='egrep --color=auto'
+fi
+
+# some more ls aliases
+alias ll='ls -alF'
+alias la='ls -A'
+alias l='ls -CF'
+
+# Alias definitions.
+# You may want to put all your additions into a separate file like
+# ~/.bash_aliases, instead of adding them here directly.
+# See /usr/share/doc/bash-doc/examples in the bash-doc package.
+
+if [ -f ~/.bash_aliases ]; then
+    . ~/.bash_aliases
+fi
+
+# enable programmable completion features (you don't need to enable
+# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
+# sources /etc/bash.bashrc).
+#if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
+#    . /etc/bash_completion
+#fi
+
+export NVM_DIR="/usr/local/nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+
+# >>> conda initialize >>>
+# !! Contents within this block are managed by 'conda init' !!
+__conda_setup="$('/root/pinokio/bin/miniconda/bin/conda' 'shell.bash' 'hook' 2> /dev/null)"
+if [ $? -eq 0 ]; then
+    eval "$__conda_setup"
+else
+    if [ -f "/root/pinokio/bin/miniconda/etc/profile.d/conda.sh" ]; then
+        . "/root/pinokio/bin/miniconda/etc/profile.d/conda.sh"
+    else
+        export PATH="/root/pinokio/bin/miniconda/bin:$PATH"
+    fi
+fi
+unset __conda_setup
+# <<< conda initialize <<<
diff --git a/Dockerfile b/Docker/Dockerfile
similarity index 54%
rename from Dockerfile
rename to Docker/Dockerfile
index 5df62799..15a0e59e 100644
--- a/Dockerfile
+++ b/Docker/Dockerfile
@@ -1,15 +1,19 @@
 # Use the NVIDIA CUDA base image with cuDNN support
-# FROM nvidia/cuda:12.8.0-cudnn-runtime-ubuntu24.04
 FROM nvidia/cuda:12.2.2-base-ubuntu22.04
 
-
 # Install necessary packages
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get upgrade -y && apt-get install -y \
     curl \
-    libpng-dev \
-    libglib2.0-0 \
+    build-essential \
+    xvfb \
     && rm -rf /var/lib/apt/lists/*
 
+# Ensure common libraries are accessible
+# RUN mkdir -p /usr/local/lib && \
+    # ln -sf /usr/lib/x86_64-linux-gnu/libpng16.so.16 /usr/local/lib/libpng16.so.16
+
+# Set LD_LIBRARY_PATH to ensure shared libraries are found
+# ENV LD_LIBRARY_PATH="/usr/local/lib:/usr/lib:/usr/lib/x86_64-linux-gnu:${LD_LIBRARY_PATH}"
 
 # Set up X Virtual Framebuffer
 ENV DISPLAY=:99
@@ -27,7 +31,6 @@ RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | b
     && ln -s $NVM_DIR/versions/node/v$NODE_VERSION/bin/node /usr/local/bin/node \
     && ln -s $NVM_DIR/versions/node/v$NODE_VERSION/bin/npm /usr/local/bin/npm
 
-
 # Set the working directory
 WORKDIR /app
 
@@ -37,19 +40,33 @@ COPY package*.json ./
 # Install Node.js dependencies
 RUN npm install
 
-# Copy the rest of the application code
+# Copy all files from the parent directory, excluding the Docker directory
 COPY . .
+# Create a .dockerignore file in the same directory as your Dockerfile with "Docker/" listed
 
 # Create pinokio.json file in the script directory with the home directory set
-RUN echo '{"home": "/root/.pinokio"}' > /app/script/pinokio.json
+
+RUN mkdir -p /root/config
+
+RUN echo '{"home": "/root/pinokio"}' > /root/config/pinokio.json
+
+RUN ln -s /root/config/pinokio.json /app/script/pinokio.json
+
+COPY Docker/.bashrc /root/.bashrc
 
 # Expose the port that the application will run on
-EXPOSE 4200
+EXPOSE 41999
 
-# patch server script to not display in window
+# Patch server script to not display in window
 RUN sed -i '1s|^|global.window = global.window \|\| {}; global.window.location = { href: \"http://localhost\" }; \n|' /app/script/index.js
 
+# Copy the entrypoint script
+# COPY entrypoint.sh /entrypoint.sh
+# RUN chmod +x /entrypoint.sh
 
+# Start the application using the entrypoint script
+# CMD ["/entrypoint.sh"]
 
 # Start the application
 CMD ["npm", "start"]
+
diff --git a/docker-compose.yml b/docker-compose.yml
index 16ed678c..50f0e2c0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,10 +1,19 @@
 services:
   pinokiod:
-    build: .
+    build: 
+      context: .
+      dockerfile: Docker/Dockerfile
+    network_mode: "host"
+    # ports:
+    #   - "41999:41999"
     environment:
-      - PINOKIO_HOME=/app/data
-    ports:
-      - "41999:41999"
+      - HOME=/root
+      - PINOKIO_HOME=/root/pinokio
+      - NVIDIA_VISIBLE_DEVICES=all
+      - NVIDIA_DRIVER_CAPABILITIES=compute,utility
+      # - LD_LIBRARY_PATH=/usr/local/lib:/usr/lib/x86_64-linux-gnu:/usr/lib
+      # - PYTHONPATH=/root/.pinokio/api/fluxgym.git
+    restart: unless-stopped
     deploy:
       resources:
         reservations:
@@ -13,9 +22,6 @@ services:
               count: all
               capabilities: [gpu]
     volumes:
-      - ./volumes/home:/root
-
-volumes:
-  pinokio_models:
-    driver: local
+      - ./Docker/volumes/pinokio:/root/pinokio
+      - ./Docker/volumes/pinokio-config:/root/config
 

From 8772df8bb03828c03688481c8a1d9dbbb2d33369 Mon Sep 17 00:00:00 2001
From: Michael Gold <goldmichael@gmail.com>
Date: Sat, 15 Mar 2025 11:53:26 +0000
Subject: [PATCH 5/5] chore: remove dead code

---
 .gitignore         |  2 +-
 Docker/Dockerfile  | 13 +------------
 docker-compose.yml |  9 +++------
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 46b76d52..88029d8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,4 @@ node_modules
 log.txt
 script/pinokio.json
 __pycache__
-volumes
+volumes
\ No newline at end of file
diff --git a/Docker/Dockerfile b/Docker/Dockerfile
index 15a0e59e..0eb908cd 100644
--- a/Docker/Dockerfile
+++ b/Docker/Dockerfile
@@ -8,12 +8,6 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \
     xvfb \
     && rm -rf /var/lib/apt/lists/*
 
-# Ensure common libraries are accessible
-# RUN mkdir -p /usr/local/lib && \
-    # ln -sf /usr/lib/x86_64-linux-gnu/libpng16.so.16 /usr/local/lib/libpng16.so.16
-
-# Set LD_LIBRARY_PATH to ensure shared libraries are found
-# ENV LD_LIBRARY_PATH="/usr/local/lib:/usr/lib:/usr/lib/x86_64-linux-gnu:${LD_LIBRARY_PATH}"
 
 # Set up X Virtual Framebuffer
 ENV DISPLAY=:99
@@ -42,7 +36,7 @@ RUN npm install
 
 # Copy all files from the parent directory, excluding the Docker directory
 COPY . .
-# Create a .dockerignore file in the same directory as your Dockerfile with "Docker/" listed
+
 
 # Create pinokio.json file in the script directory with the home directory set
 
@@ -60,12 +54,7 @@ EXPOSE 41999
 # Patch server script to not display in window
 RUN sed -i '1s|^|global.window = global.window \|\| {}; global.window.location = { href: \"http://localhost\" }; \n|' /app/script/index.js
 
-# Copy the entrypoint script
-# COPY entrypoint.sh /entrypoint.sh
-# RUN chmod +x /entrypoint.sh
 
-# Start the application using the entrypoint script
-# CMD ["/entrypoint.sh"]
 
 # Start the application
 CMD ["npm", "start"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 50f0e2c0..8703eb2f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,15 +4,13 @@ services:
       context: .
       dockerfile: Docker/Dockerfile
     network_mode: "host"
-    # ports:
-    #   - "41999:41999"
+  
     environment:
       - HOME=/root
       - PINOKIO_HOME=/root/pinokio
       - NVIDIA_VISIBLE_DEVICES=all
       - NVIDIA_DRIVER_CAPABILITIES=compute,utility
-      # - LD_LIBRARY_PATH=/usr/local/lib:/usr/lib/x86_64-linux-gnu:/usr/lib
-      # - PYTHONPATH=/root/.pinokio/api/fluxgym.git
+ 
     restart: unless-stopped
     deploy:
       resources:
@@ -23,5 +21,4 @@ services:
               capabilities: [gpu]
     volumes:
       - ./Docker/volumes/pinokio:/root/pinokio
-      - ./Docker/volumes/pinokio-config:/root/config
-
+      - ./Docker/volumes/pinokio-config:/root/config
\ No newline at end of file