mirror of
https://github.com/bytebot-ai/bytebot.git
synced 2026-08-30 17:19:26 +08:00
Update Docker definitons
This commit is contained in:
Carl Atupem
@@ -47,4 +47,3 @@ jobs:
|
||||
cache-to: type=gha,mode=max
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ on:
|
||||
branches:
|
||||
- main
|
||||
paths:
|
||||
- "infrastructure/docker/**"
|
||||
- "docker/**"
|
||||
- "packages/bytebotd/**"
|
||||
|
||||
permissions:
|
||||
@@ -50,8 +50,8 @@ jobs:
|
||||
DOCKER_BUILD_SUMMARY: false # keep logs concise
|
||||
DOCKER_BUILD_RECORD_UPLOAD: false
|
||||
with:
|
||||
context: .
|
||||
file: ./infrastructure/docker/Dockerfile
|
||||
context: ./packages/
|
||||
file: ./packages/bytebotd/Dockerfile
|
||||
platforms: linux/amd64,linux/arm64 # build both archs in one go
|
||||
push: true
|
||||
cache-from: type=gha
|
||||
|
||||
@@ -4,8 +4,8 @@ services:
|
||||
bytebot-desktop:
|
||||
# Build from source
|
||||
build:
|
||||
context: ../../
|
||||
dockerfile: infrastructure/docker/Dockerfile
|
||||
context: ../packages/
|
||||
dockerfile: bytebotd/Dockerfile
|
||||
# Use pre-built image
|
||||
image: ghcr.io/bytebot-ai/bytebot-desktop:edge
|
||||
|
||||
@@ -4,8 +4,8 @@ services:
|
||||
bytebot-desktop:
|
||||
# Build from source
|
||||
build:
|
||||
context: ../../
|
||||
dockerfile: infrastructure/docker/Dockerfile
|
||||
context: ../packages/
|
||||
dockerfile: bytebotd/Dockerfile
|
||||
# Use pre-built image
|
||||
image: ghcr.io/bytebot-ai/bytebot-desktop:edge
|
||||
shm_size: "2g"
|
||||
@@ -37,7 +37,7 @@ services:
|
||||
|
||||
bytebot-agent:
|
||||
build:
|
||||
context: ../../packages/
|
||||
context: ../packages/
|
||||
dockerfile: bytebot-agent/Dockerfile
|
||||
# Use pre-built image
|
||||
image: ghcr.io/bytebot-ai/bytebot-agent:edge
|
||||
@@ -56,7 +56,7 @@ services:
|
||||
|
||||
bytebot-ui:
|
||||
build:
|
||||
context: ../../packages/
|
||||
context: ../packages/
|
||||
dockerfile: bytebot-ui/Dockerfile
|
||||
args:
|
||||
- BYTEBOT_AGENT_BASE_URL=${BYTEBOT_AGENT_BASE_URL:-http://bytebot-agent:9991}
|
||||
@@ -1,405 +0,0 @@
|
||||
# -----------------------------------------------------------------------------
|
||||
# Bytebot Dockerfile - Virtual Desktop Environment
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
# Base image
|
||||
FROM ubuntu:22.04
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# 1. Environment setup
|
||||
# -----------------------------------------------------------------------------
|
||||
# Set non-interactive installation
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
# Configure display for X11 applications
|
||||
ENV DISPLAY=:0
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# 2. System dependencies installation
|
||||
# -----------------------------------------------------------------------------
|
||||
RUN apt-get update && apt-get install -y \
|
||||
# X11 / VNC
|
||||
xvfb x11vnc xauth x11-xserver-utils \
|
||||
x11-apps sudo software-properties-common \
|
||||
# Desktop environment
|
||||
xfce4 xfce4-goodies dbus \
|
||||
# Display manager with autologin capability
|
||||
lightdm \
|
||||
# Development tools
|
||||
python3 python3-pip curl wget git vim \
|
||||
# Utilities
|
||||
supervisor netcat-openbsd \
|
||||
# Applications
|
||||
xpdf gedit xpaint \
|
||||
# Libraries
|
||||
libxtst-dev \
|
||||
# Remove unneeded dependencies
|
||||
&& apt-get remove -y light-locker xfce4-screensaver xfce4-power-manager || true \
|
||||
# Clean up to reduce image size
|
||||
&& apt-get clean && rm -rf /var/lib/apt/lists/*
|
||||
|
||||
RUN mkdir -p /run/dbus && \
|
||||
# Generate a machine-id so dbus-daemon doesn't complain
|
||||
dbus-uuidgen --ensure=/etc/machine-id
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# 3. Additional software installation
|
||||
# -----------------------------------------------------------------------------
|
||||
# Install Firefox
|
||||
RUN apt-get update && apt-get install -y \
|
||||
# Install necessary for adding PPA
|
||||
software-properties-common apt-transport-https wget gnupg \
|
||||
# Install Additional Graphics Libraries
|
||||
mesa-utils \
|
||||
libgl1-mesa-dri \
|
||||
libgl1-mesa-glx \
|
||||
# Install Sandbox Capabilities
|
||||
libcap2-bin \
|
||||
# Install Fonts
|
||||
fontconfig \
|
||||
fonts-dejavu \
|
||||
fonts-liberation \
|
||||
fonts-freefont-ttf \
|
||||
&& add-apt-repository -y ppa:mozillateam/ppa \
|
||||
&& apt-get update \
|
||||
&& apt-get install -y firefox-esr thunderbird \
|
||||
&& apt-get clean && rm -rf /var/lib/apt/lists/* \
|
||||
# Set Firefox as default browser system-wide
|
||||
&& update-alternatives --install /usr/bin/x-www-browser x-www-browser /usr/bin/firefox-esr 200 \
|
||||
&& update-alternatives --set x-www-browser /usr/bin/firefox-esr \
|
||||
# Configure default MIME handlers for web content
|
||||
&& mkdir -p /etc/xdg/xfce4/helpers \
|
||||
&& echo '[Desktop Entry]' > /etc/xdg/xfce4/helpers/firefox.desktop \
|
||||
&& echo 'Version=1.0' >> /etc/xdg/xfce4/helpers/firefox.desktop \
|
||||
&& echo 'Type=X-XFCE-Helper' >> /etc/xdg/xfce4/helpers/firefox.desktop \
|
||||
&& echo 'Name=Firefox Web Browser' >> /etc/xdg/xfce4/helpers/firefox.desktop \
|
||||
&& echo 'X-XFCE-Binaries=firefox-esr;firefox;' >> /etc/xdg/xfce4/helpers/firefox.desktop \
|
||||
&& echo 'X-XFCE-Category=WebBrowser' >> /etc/xdg/xfce4/helpers/firefox.desktop \
|
||||
&& echo 'X-XFCE-Commands=%B;%B' >> /etc/xdg/xfce4/helpers/firefox.desktop \
|
||||
&& echo 'X-XFCE-CommandsWithParameter=%B %s;%B %s;' >> /etc/xdg/xfce4/helpers/firefox.desktop \
|
||||
&& echo 'WebBrowser=firefox-esr' > /etc/xdg/xfce4/helpers.rc \
|
||||
&& fc-cache -f -v
|
||||
|
||||
RUN install -m 0755 -d /etc/firefox/policies && \
|
||||
cat > /etc/firefox/policies/policies.json <<'EOF'
|
||||
{
|
||||
"policies": {
|
||||
"FirefoxHome": {
|
||||
"Search": true, "TopSites": false, "SponsoredTopSites": false,
|
||||
"Highlights": false, "Pocket": false, "SponsoredPocket": false,
|
||||
"Snippets": false, "Locked": true
|
||||
},
|
||||
"PDFjs": { "Enabled": true, "EnablePermissions": true },
|
||||
"Notifications": { "BlockNewRequests": true, "Locked": true },
|
||||
"UserMessaging": {
|
||||
"ExtensionRecommendations": false, "FeatureRecommendations": false,
|
||||
"UrlbarInterventions": false, "SkipOnboarding": true,
|
||||
"MoreFromMozilla": false, "FirefoxLabs": false
|
||||
}
|
||||
}
|
||||
}
|
||||
EOF
|
||||
|
||||
# Configure Thunderbird policies
|
||||
RUN install -m 0755 -d /etc/thunderbird/policies && \
|
||||
cat > /etc/thunderbird/policies/policies.json <<'EOF'
|
||||
{
|
||||
"policies": {
|
||||
"UserMessaging": {
|
||||
"ExtensionRecommendations": false,
|
||||
"FeatureRecommendations": false,
|
||||
"UrlbarInterventions": false,
|
||||
"SkipOnboarding": true,
|
||||
"MoreFromMozilla": false
|
||||
},
|
||||
"OverrideFirstRunPage": "",
|
||||
"OverridePostUpdatePage": "",
|
||||
"InAppNotification": {
|
||||
"DonationEnabled": false,
|
||||
"SurveyEnabled": false,
|
||||
"MessageEnabled": false
|
||||
}
|
||||
}
|
||||
}
|
||||
EOF
|
||||
|
||||
# Install 1Password based on architecture
|
||||
RUN ARCH=$(dpkg --print-architecture) && \
|
||||
if [ "$ARCH" = "amd64" ]; then \
|
||||
# Install from APT repository for AMD64
|
||||
curl -sS https://downloads.1password.com/linux/keys/1password.asc | \
|
||||
gpg --dearmor --output /usr/share/keyrings/1password-archive-keyring.gpg && \
|
||||
echo "deb [arch=amd64 signed-by=/usr/share/keyrings/1password-archive-keyring.gpg] https://downloads.1password.com/linux/debian/amd64 stable main" | \
|
||||
tee /etc/apt/sources.list.d/1password.list && \
|
||||
mkdir -p /etc/debsig/policies/AC2D62742012EA22/ && \
|
||||
curl -sS https://downloads.1password.com/linux/debian/debsig/1password.pol | \
|
||||
tee /etc/debsig/policies/AC2D62742012EA22/1password.pol && \
|
||||
mkdir -p /usr/share/debsig/keyrings/AC2D62742012EA22 && \
|
||||
curl -sS https://downloads.1password.com/linux/keys/1password.asc | \
|
||||
gpg --dearmor --output /usr/share/debsig/keyrings/AC2D62742012EA22/debsig.gpg && \
|
||||
apt-get update && apt-get install -y 1password && \
|
||||
apt-get clean && rm -rf /var/lib/apt/lists/*; \
|
||||
elif [ "$ARCH" = "arm64" ]; then \
|
||||
# Install from tar.gz for ARM64
|
||||
apt-get update && apt-get install -y \
|
||||
libgtk-3-0 libnotify4 libnss3 libxss1 libxtst6 xdg-utils \
|
||||
libatspi2.0-0 libdrm2 libgbm1 libxcb-dri3-0 libxkbcommon0 \
|
||||
libsecret-1-0 && \
|
||||
apt-get clean && rm -rf /var/lib/apt/lists/* && \
|
||||
curl -sSL https://downloads.1password.com/linux/tar/beta/aarch64/1password-latest.tar.gz -o /tmp/1password.tar.gz && \
|
||||
mkdir -p /opt && \
|
||||
tar -xzf /tmp/1password.tar.gz -C /opt && \
|
||||
rm /tmp/1password.tar.gz && \
|
||||
# Find the actual 1password binary location
|
||||
find /opt -name "1password" -type f -executable | head -1 | xargs -I {} ln -sf {} /usr/local/bin/1password && \
|
||||
# Try to find and copy icon files
|
||||
mkdir -p /usr/share/pixmaps /usr/share/icons/hicolor/512x512/apps /usr/share/icons/hicolor/256x256/apps && \
|
||||
(find /opt -name "*.png" -path "*1password*" -o -name "*.svg" -path "*1password*" | while read icon; do \
|
||||
if [[ "$icon" == *"512"* ]]; then \
|
||||
cp "$icon" /usr/share/icons/hicolor/512x512/apps/1password.png 2>/dev/null || true; \
|
||||
elif [[ "$icon" == *"256"* ]]; then \
|
||||
cp "$icon" /usr/share/icons/hicolor/256x256/apps/1password.png 2>/dev/null || true; \
|
||||
fi; \
|
||||
cp "$icon" /usr/share/pixmaps/1password.png 2>/dev/null || true; \
|
||||
done) && \
|
||||
# Create desktop entry manually for ARM64
|
||||
mkdir -p /usr/share/applications && \
|
||||
echo '[Desktop Entry]' > /usr/share/applications/1password.desktop && \
|
||||
echo 'Version=1.0' >> /usr/share/applications/1password.desktop && \
|
||||
echo 'Type=Application' >> /usr/share/applications/1password.desktop && \
|
||||
echo 'Name=1Password' >> /usr/share/applications/1password.desktop && \
|
||||
echo 'Comment=Password manager and secure wallet' >> /usr/share/applications/1password.desktop && \
|
||||
echo 'Exec=/usr/local/bin/1password %U' >> /usr/share/applications/1password.desktop && \
|
||||
echo 'Icon=1password' >> /usr/share/applications/1password.desktop && \
|
||||
echo 'Terminal=false' >> /usr/share/applications/1password.desktop && \
|
||||
echo 'StartupNotify=true' >> /usr/share/applications/1password.desktop && \
|
||||
echo 'Categories=Utility;Security;' >> /usr/share/applications/1password.desktop && \
|
||||
echo 'MimeType=x-scheme-handler/onepassword;' >> /usr/share/applications/1password.desktop && \
|
||||
# Update icon cache
|
||||
gtk-update-icon-cache -f -t /usr/share/icons/hicolor 2>/dev/null || true; \
|
||||
else \
|
||||
echo "1Password is not available for $ARCH architecture."; \
|
||||
fi
|
||||
|
||||
# Install Node.js
|
||||
RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
|
||||
&& apt-get update \
|
||||
&& apt-get install -y nodejs \
|
||||
&& apt-get clean && rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Upgrade pip
|
||||
RUN pip3 install --upgrade pip
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# 4. VNC and remote access setup
|
||||
# -----------------------------------------------------------------------------
|
||||
# Install noVNC and websockify
|
||||
RUN git clone https://github.com/novnc/noVNC.git /opt/noVNC \
|
||||
&& git clone https://github.com/novnc/websockify.git /opt/websockify \
|
||||
&& cd /opt/websockify \
|
||||
&& pip3 install --break-system-packages .
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# 5. Application setup (bytebotd)
|
||||
# -----------------------------------------------------------------------------
|
||||
# Copy package files first to leverage Docker cache
|
||||
|
||||
# Install dependencies required to build libnut-core and uiohook-napi
|
||||
RUN apt-get update && \
|
||||
apt-get install -y \
|
||||
cmake \
|
||||
libx11-dev \
|
||||
libxtst-dev \
|
||||
libxinerama-dev \
|
||||
libxi-dev \
|
||||
libxt-dev \
|
||||
libxrandr-dev \
|
||||
libxkbcommon-dev \
|
||||
libxkbcommon-x11-dev \
|
||||
git build-essential && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
|
||||
COPY ./packages/bytebotd/ /bytebotd/
|
||||
WORKDIR /bytebotd
|
||||
RUN npm install --build-from-source
|
||||
RUN npm rebuild uiohook-napi --build-from-source
|
||||
|
||||
RUN npm run build
|
||||
|
||||
WORKDIR /compile
|
||||
|
||||
RUN git clone https://github.com/ZachJW34/libnut-core.git && \
|
||||
cd libnut-core && \
|
||||
npm install && \
|
||||
npm run build:release
|
||||
|
||||
# replace /bytebotd/node_modules/@nut-tree-fork/libnut-linux/build/Release/libnut.node with /compile/libnut-core/build/Release/libnut.node
|
||||
RUN rm -f /bytebotd/node_modules/@nut-tree-fork/libnut-linux/build/Release/libnut.node && \
|
||||
cp /compile/libnut-core/build/Release/libnut.node /bytebotd/node_modules/@nut-tree-fork/libnut-linux/build/Release/libnut.node
|
||||
|
||||
RUN rm -rf /compile
|
||||
|
||||
WORKDIR /bytebotd
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# 6. System configuration
|
||||
# -----------------------------------------------------------------------------
|
||||
# Add Supervisor Configuration for service management
|
||||
COPY ./infrastructure/docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
|
||||
|
||||
# Set restrictive permissions on supervisord configuration
|
||||
RUN chmod 644 /etc/supervisor/conf.d/supervisord.conf && \
|
||||
chown root:root /etc/supervisor/conf.d/supervisord.conf
|
||||
|
||||
# Set restrictive permissions on bytebotd directory
|
||||
RUN chown -R root:root /bytebotd && \
|
||||
chmod -R 755 /bytebotd
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# 7. User setup and autologin configuration
|
||||
# -----------------------------------------------------------------------------
|
||||
# Create non-root user
|
||||
RUN useradd -ms /bin/bash bytebot && echo "bytebot ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
|
||||
|
||||
RUN chmod 755 /var/run/dbus && \
|
||||
chown bytebot:bytebot /var/run/dbus
|
||||
|
||||
RUN mkdir -p /tmp/bytebot-screenshots && \
|
||||
chown -R bytebot:bytebot /tmp/bytebot-screenshots
|
||||
|
||||
# Configure autologin for the bytebot user
|
||||
RUN mkdir -p /etc/lightdm/lightdm.conf.d && \
|
||||
echo '[Seat:*]' > /etc/lightdm/lightdm.conf.d/50-autologin.conf && \
|
||||
echo 'autologin-user=bytebot' >> /etc/lightdm/lightdm.conf.d/50-autologin.conf && \
|
||||
echo 'autologin-user-timeout=0' >> /etc/lightdm/lightdm.conf.d/50-autologin.conf && \
|
||||
echo 'autologin-session=xfce' >> /etc/lightdm/lightdm.conf.d/50-autologin.conf
|
||||
|
||||
# Make sure the lightdm configuration has proper permissions
|
||||
RUN chmod 644 /etc/lightdm/lightdm.conf.d/50-autologin.conf && \
|
||||
chown root:root /etc/lightdm/lightdm.conf.d/50-autologin.conf
|
||||
|
||||
# Set custom desktop background
|
||||
# Create backgrounds directory
|
||||
RUN mkdir -p /usr/share/backgrounds/bytebot
|
||||
|
||||
# Copy background.jpg from the build context
|
||||
COPY ./static/background.jpg /usr/share/backgrounds/bytebot/
|
||||
RUN chmod 644 /usr/share/backgrounds/bytebot/background.jpg
|
||||
|
||||
# Add XFCE configuration files
|
||||
COPY ./infrastructure/docker/xfce4/ /tmp/xfce4/
|
||||
|
||||
# Set up XFCE configuration
|
||||
RUN mkdir -p /home/bytebot/.config/xfce4/ && \
|
||||
mkdir -p /home/bytebot/Desktop && \
|
||||
# Copy the XFCE configuration files
|
||||
cp -r /tmp/xfce4/* /home/bytebot/.config/xfce4/ && \
|
||||
# Create .xsessionrc file for the user to ensure XFCE starts properly
|
||||
mkdir -p /home/bytebot/.config && \
|
||||
echo "exec startxfce4" > /home/bytebot/.xsessionrc && \
|
||||
# Ensure all settings are owned by the user
|
||||
chown -R bytebot:bytebot /home/bytebot/.config /home/bytebot/Desktop /home/bytebot/.xsessionrc
|
||||
|
||||
# Replace default Web Browser shortcut with Firefox
|
||||
RUN mkdir -p /etc/skel/.config/xfce4/panel/launcher-* && \
|
||||
mkdir -p /usr/share/applications/ && \
|
||||
echo '[Desktop Entry]' > /usr/share/applications/firefox.desktop && \
|
||||
echo 'Version=1.0' >> /usr/share/applications/firefox.desktop && \
|
||||
echo 'Type=Application' >> /usr/share/applications/firefox.desktop && \
|
||||
echo 'Name=Firefox Web Browser' >> /usr/share/applications/firefox.desktop && \
|
||||
echo 'Comment=Browse the web with Firefox' >> /usr/share/applications/firefox.desktop && \
|
||||
echo 'Exec=/usr/bin/firefox-esr %U' >> /usr/share/applications/firefox.desktop && \
|
||||
echo 'Icon=firefox-esr' >> /usr/share/applications/firefox.desktop && \
|
||||
echo 'Path=' >> /usr/share/applications/firefox.desktop && \
|
||||
echo 'Terminal=false' >> /usr/share/applications/firefox.desktop && \
|
||||
echo 'StartupNotify=true' >> /usr/share/applications/firefox.desktop && \
|
||||
echo 'Categories=Network;WebBrowser;' >> /usr/share/applications/firefox.desktop && \
|
||||
chmod +x /usr/share/applications/firefox.desktop && \
|
||||
# Copy Firefox desktop file to panel configuration
|
||||
mkdir -p /home/bytebot/.config/xfce4/panel && \
|
||||
cp -f /usr/share/applications/firefox.desktop /home/bytebot/.config/xfce4/panel/ && \
|
||||
# Create a backup of the default XFCE panel configuration
|
||||
mkdir -p /etc/xdg/xfce4/panel/backup && \
|
||||
# Also add Firefox to desktop
|
||||
mkdir -p /home/bytebot/Desktop && \
|
||||
cp -f /usr/share/applications/firefox.desktop /home/bytebot/Desktop/ && \
|
||||
chown -R bytebot:bytebot /home/bytebot/.config/xfce4/panel /home/bytebot/Desktop
|
||||
|
||||
# Add Thunderbird desktop shortcut
|
||||
RUN echo '[Desktop Entry]' > /usr/share/applications/thunderbird.desktop && \
|
||||
echo 'Version=1.0' >> /usr/share/applications/thunderbird.desktop && \
|
||||
echo 'Type=Application' >> /usr/share/applications/thunderbird.desktop && \
|
||||
echo 'Name=Thunderbird Mail' >> /usr/share/applications/thunderbird.desktop && \
|
||||
echo 'Comment=Read and send emails with Thunderbird' >> /usr/share/applications/thunderbird.desktop && \
|
||||
echo 'Exec=/usr/bin/thunderbird %U' >> /usr/share/applications/thunderbird.desktop && \
|
||||
echo 'Icon=thunderbird' >> /usr/share/applications/thunderbird.desktop && \
|
||||
echo 'Path=' >> /usr/share/applications/thunderbird.desktop && \
|
||||
echo 'Terminal=false' >> /usr/share/applications/thunderbird.desktop && \
|
||||
echo 'StartupNotify=true' >> /usr/share/applications/thunderbird.desktop && \
|
||||
echo 'Categories=Network;Email;' >> /usr/share/applications/thunderbird.desktop && \
|
||||
echo 'MimeType=x-scheme-handler/mailto;application/x-xpinstall;message/rfc822;' >> /usr/share/applications/thunderbird.desktop && \
|
||||
chmod +x /usr/share/applications/thunderbird.desktop && \
|
||||
# Also add Thunderbird to desktop
|
||||
mkdir -p /home/bytebot/Desktop && \
|
||||
cp -f /usr/share/applications/thunderbird.desktop /home/bytebot/Desktop/ && \
|
||||
chown -R bytebot:bytebot /home/bytebot/Desktop
|
||||
|
||||
# Add 1Password desktop shortcut
|
||||
RUN if [ -f /usr/local/bin/1password ] || [ -f /opt/1Password/1password ] || [ -f /opt/1password/1password ]; then \
|
||||
# Desktop shortcut should already exist from installation, but ensure it's on desktop
|
||||
if [ -f /usr/share/applications/1password.desktop ]; then \
|
||||
mkdir -p /home/bytebot/Desktop && \
|
||||
cp -f /usr/share/applications/1password.desktop /home/bytebot/Desktop/ && \
|
||||
chmod +x /home/bytebot/Desktop/1password.desktop; \
|
||||
else \
|
||||
# Create desktop entry if it doesn't exist
|
||||
echo '[Desktop Entry]' > /usr/share/applications/1password.desktop && \
|
||||
echo 'Version=1.0' >> /usr/share/applications/1password.desktop && \
|
||||
echo 'Type=Application' >> /usr/share/applications/1password.desktop && \
|
||||
echo 'Name=1Password' >> /usr/share/applications/1password.desktop && \
|
||||
echo 'Comment=Password manager and secure wallet' >> /usr/share/applications/1password.desktop && \
|
||||
if [ -f /opt/1password/1password ]; then \
|
||||
echo 'Exec=/opt/1password/1password %U' >> /usr/share/applications/1password.desktop; \
|
||||
else \
|
||||
echo 'Exec=/opt/1Password/1password %U' >> /usr/share/applications/1password.desktop; \
|
||||
fi && \
|
||||
echo 'Icon=1password' >> /usr/share/applications/1password.desktop && \
|
||||
echo 'Terminal=false' >> /usr/share/applications/1password.desktop && \
|
||||
echo 'StartupNotify=true' >> /usr/share/applications/1password.desktop && \
|
||||
echo 'Categories=Utility;Security;' >> /usr/share/applications/1password.desktop && \
|
||||
echo 'MimeType=x-scheme-handler/onepassword;' >> /usr/share/applications/1password.desktop && \
|
||||
chmod +x /usr/share/applications/1password.desktop && \
|
||||
mkdir -p /home/bytebot/Desktop && \
|
||||
cp -f /usr/share/applications/1password.desktop /home/bytebot/Desktop/; \
|
||||
fi && \
|
||||
chown -R bytebot:bytebot /home/bytebot/Desktop; \
|
||||
fi
|
||||
|
||||
# Add a desktop shortcut for the Terminal
|
||||
RUN echo '[Desktop Entry]' > /usr/share/applications/terminal.desktop && \
|
||||
echo 'Version=1.0' >> /usr/share/applications/terminal.desktop && \
|
||||
echo 'Type=Application' >> /usr/share/applications/terminal.desktop && \
|
||||
echo 'Name=Terminal Emulator' >> /usr/share/applications/terminal.desktop && \
|
||||
echo 'Comment=Open a terminal' >> /usr/share/applications/terminal.desktop && \
|
||||
echo 'Exec=exo-open --launch TerminalEmulator' >> /usr/share/applications/terminal.desktop && \
|
||||
echo 'Icon=org.xfce.terminalemulator' >> /usr/share/applications/terminal.desktop && \
|
||||
echo 'Path=' >> /usr/share/applications/terminal.desktop && \
|
||||
echo 'Terminal=false' >> /usr/share/applications/terminal.desktop && \
|
||||
echo 'StartupNotify=true' >> /usr/share/applications/terminal.desktop && \
|
||||
echo 'Categories=Utility;TerminalEmulator;' >> /usr/share/applications/terminal.desktop && \
|
||||
chmod +x /usr/share/applications/terminal.desktop && \
|
||||
mkdir -p /home/bytebot/Desktop && \
|
||||
cp -f /usr/share/applications/terminal.desktop /home/bytebot/Desktop/ && \
|
||||
chown -R bytebot:bytebot /home/bytebot/Desktop
|
||||
|
||||
USER bytebot
|
||||
WORKDIR /home/bytebot
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# 8. Port configuration and runtime
|
||||
# -----------------------------------------------------------------------------
|
||||
# - Port 9990: bytebotd and external noVNC websocket
|
||||
EXPOSE 9990
|
||||
|
||||
# Start supervisor to manage all services
|
||||
CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf", "-n"]
|
||||
@@ -1 +0,0 @@
|
||||
/home/bytebot/.config/xfce4/desktop/icons.screen0-1264x673.rc
|
||||
@@ -1,28 +0,0 @@
|
||||
[xfdesktop-version-4.10.3+-rcfile_format]
|
||||
4.10.3+=true
|
||||
|
||||
[/home/bytebot/Desktop/firefox.desktop]
|
||||
row=0
|
||||
col=0
|
||||
|
||||
[/home/bytebot/Desktop/thunderbird.desktop]
|
||||
row=1
|
||||
col=0
|
||||
|
||||
[/home/bytebot/Desktop/1password.desktop]
|
||||
row=2
|
||||
col=0
|
||||
|
||||
[/home/bytebot/Desktop/xfce4-terminal-emulator.desktop]
|
||||
row=3
|
||||
col=0
|
||||
|
||||
|
||||
[/home/bytebot]
|
||||
row=4
|
||||
col=0
|
||||
|
||||
|
||||
[Trash]
|
||||
row=5
|
||||
col=0
|
||||
@@ -0,0 +1,223 @@
|
||||
# -----------------------------------------------------------------------------
|
||||
# Bytebot Dockerfile - Virtual Desktop Environment
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
# Base image
|
||||
FROM ubuntu:22.04
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# 1. Environment setup
|
||||
# -----------------------------------------------------------------------------
|
||||
# Set non-interactive installation
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
# Configure display for X11 applications
|
||||
ENV DISPLAY=:0
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# 2. System dependencies installation
|
||||
# -----------------------------------------------------------------------------
|
||||
RUN apt-get update && apt-get install -y \
|
||||
# X11 / VNC
|
||||
xvfb x11vnc xauth x11-xserver-utils \
|
||||
x11-apps sudo software-properties-common \
|
||||
# Desktop environment
|
||||
xfce4 xfce4-goodies dbus \
|
||||
# Display manager with autologin capability
|
||||
lightdm \
|
||||
# Development tools
|
||||
python3 python3-pip curl wget git vim \
|
||||
# Utilities
|
||||
supervisor netcat-openbsd \
|
||||
# Applications
|
||||
xpdf gedit xpaint \
|
||||
# Libraries
|
||||
libxtst-dev \
|
||||
# Remove unneeded dependencies
|
||||
&& apt-get remove -y light-locker xfce4-screensaver xfce4-power-manager || true \
|
||||
# Clean up to reduce image size
|
||||
&& apt-get clean && rm -rf /var/lib/apt/lists/*
|
||||
|
||||
RUN mkdir -p /run/dbus && \
|
||||
# Generate a machine-id so dbus-daemon doesn't complain
|
||||
dbus-uuidgen --ensure=/etc/machine-id
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# 3. Additional software installation
|
||||
# -----------------------------------------------------------------------------
|
||||
# Install Firefox
|
||||
RUN apt-get update && apt-get install -y \
|
||||
# Install necessary for adding PPA
|
||||
software-properties-common apt-transport-https wget gnupg \
|
||||
# Install Additional Graphics Libraries
|
||||
mesa-utils \
|
||||
libgl1-mesa-dri \
|
||||
libgl1-mesa-glx \
|
||||
# Install Sandbox Capabilities
|
||||
libcap2-bin \
|
||||
# Install Fonts
|
||||
fontconfig \
|
||||
fonts-dejavu \
|
||||
fonts-liberation \
|
||||
fonts-freefont-ttf \
|
||||
&& add-apt-repository -y ppa:mozillateam/ppa \
|
||||
&& apt-get update \
|
||||
&& apt-get install -y firefox-esr thunderbird \
|
||||
&& apt-get clean && rm -rf /var/lib/apt/lists/* \
|
||||
# Set Firefox as default browser system-wide
|
||||
&& update-alternatives --install /usr/bin/x-www-browser x-www-browser /usr/bin/firefox-esr 200 \
|
||||
&& update-alternatives --set x-www-browser /usr/bin/firefox-esr \
|
||||
&& fc-cache -f -v
|
||||
|
||||
|
||||
# Install 1Password based on architecture
|
||||
RUN ARCH=$(dpkg --print-architecture) && \
|
||||
if [ "$ARCH" = "amd64" ]; then \
|
||||
# Install from APT repository for AMD64
|
||||
curl -sS https://downloads.1password.com/linux/keys/1password.asc | \
|
||||
gpg --dearmor --output /usr/share/keyrings/1password-archive-keyring.gpg && \
|
||||
echo "deb [arch=amd64 signed-by=/usr/share/keyrings/1password-archive-keyring.gpg] https://downloads.1password.com/linux/debian/amd64 stable main" | \
|
||||
tee /etc/apt/sources.list.d/1password.list && \
|
||||
mkdir -p /etc/debsig/policies/AC2D62742012EA22/ && \
|
||||
curl -sS https://downloads.1password.com/linux/debian/debsig/1password.pol | \
|
||||
tee /etc/debsig/policies/AC2D62742012EA22/1password.pol && \
|
||||
mkdir -p /usr/share/debsig/keyrings/AC2D62742012EA22 && \
|
||||
curl -sS https://downloads.1password.com/linux/keys/1password.asc | \
|
||||
gpg --dearmor --output /usr/share/debsig/keyrings/AC2D62742012EA22/debsig.gpg && \
|
||||
apt-get update && apt-get install -y 1password && \
|
||||
apt-get clean && rm -rf /var/lib/apt/lists/*; \
|
||||
elif [ "$ARCH" = "arm64" ]; then \
|
||||
# Install from tar.gz for ARM64
|
||||
apt-get update && apt-get install -y \
|
||||
libgtk-3-0 libnotify4 libnss3 libxss1 libxtst6 xdg-utils \
|
||||
libatspi2.0-0 libdrm2 libgbm1 libxcb-dri3-0 libxkbcommon0 \
|
||||
libsecret-1-0 && \
|
||||
apt-get clean && rm -rf /var/lib/apt/lists/* && \
|
||||
curl -sSL https://downloads.1password.com/linux/tar/beta/aarch64/1password-latest.tar.gz -o /tmp/1password.tar.gz && \
|
||||
mkdir -p /tmp/1password-extract && \
|
||||
tar -xzf /tmp/1password.tar.gz -C /tmp/1password-extract && \
|
||||
# Find the actual 1password binary and copy it directly to /usr/bin/1password
|
||||
find /tmp/1password-extract -name "1password" -type f -executable | head -1 | xargs -I {} cp {} /usr/bin/1password && \
|
||||
chmod +x /usr/bin/1password && \
|
||||
# Try to find and copy icon files from the same extracted archive
|
||||
mkdir -p /usr/share/pixmaps /usr/share/icons/hicolor/512x512/apps /usr/share/icons/hicolor/256x256/apps && \
|
||||
find /tmp/1password-extract -name "*.png" -path "*1password*" -o -name "*.svg" -path "*1password*" | while read icon; do \
|
||||
if [[ "$icon" == *"512"* ]]; then \
|
||||
cp "$icon" /usr/share/icons/hicolor/512x512/apps/1password.png 2>/dev/null || true; \
|
||||
elif [[ "$icon" == *"256"* ]]; then \
|
||||
cp "$icon" /usr/share/icons/hicolor/256x256/apps/1password.png 2>/dev/null || true; \
|
||||
fi; \
|
||||
cp "$icon" /usr/share/pixmaps/1password.png 2>/dev/null || true; \
|
||||
done && \
|
||||
# Clean up temporary files
|
||||
rm -rf /tmp/1password.tar.gz /tmp/1password-extract && \
|
||||
# Update icon cache
|
||||
gtk-update-icon-cache -f -t /usr/share/icons/hicolor 2>/dev/null || true; \
|
||||
else \
|
||||
echo "1Password is not available for $ARCH architecture."; \
|
||||
fi
|
||||
|
||||
# Install Node.js
|
||||
RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
|
||||
&& apt-get update \
|
||||
&& apt-get install -y nodejs \
|
||||
&& apt-get clean && rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Upgrade pip
|
||||
RUN pip3 install --upgrade pip
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# 4. VNC and remote access setup
|
||||
# -----------------------------------------------------------------------------
|
||||
# Install noVNC and websockify
|
||||
RUN git clone https://github.com/novnc/noVNC.git /opt/noVNC \
|
||||
&& git clone https://github.com/novnc/websockify.git /opt/websockify \
|
||||
&& cd /opt/websockify \
|
||||
&& pip3 install --break-system-packages .
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# 5. Application setup (bytebotd)
|
||||
# -----------------------------------------------------------------------------
|
||||
# Copy package files first to leverage Docker cache
|
||||
|
||||
# Install dependencies required to build libnut-core and uiohook-napi
|
||||
RUN apt-get update && \
|
||||
apt-get install -y \
|
||||
cmake \
|
||||
libx11-dev \
|
||||
libxtst-dev \
|
||||
libxinerama-dev \
|
||||
libxi-dev \
|
||||
libxt-dev \
|
||||
libxrandr-dev \
|
||||
libxkbcommon-dev \
|
||||
libxkbcommon-x11-dev \
|
||||
git build-essential && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
COPY ./bytebotd/ /bytebotd/
|
||||
WORKDIR /bytebotd
|
||||
RUN npm install --build-from-source
|
||||
RUN npm rebuild uiohook-napi --build-from-source
|
||||
|
||||
RUN npm run build
|
||||
|
||||
WORKDIR /compile
|
||||
|
||||
RUN git clone https://github.com/ZachJW34/libnut-core.git && \
|
||||
cd libnut-core && \
|
||||
npm install && \
|
||||
npm run build:release
|
||||
|
||||
# replace /bytebotd/node_modules/@nut-tree-fork/libnut-linux/build/Release/libnut.node with /compile/libnut-core/build/Release/libnut.node
|
||||
RUN rm -f /bytebotd/node_modules/@nut-tree-fork/libnut-linux/build/Release/libnut.node && \
|
||||
cp /compile/libnut-core/build/Release/libnut.node /bytebotd/node_modules/@nut-tree-fork/libnut-linux/build/Release/libnut.node
|
||||
|
||||
RUN rm -rf /compile
|
||||
|
||||
WORKDIR /bytebotd
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# 7. User setup and autologin configuration
|
||||
# -----------------------------------------------------------------------------
|
||||
# Create non-root user
|
||||
RUN useradd -ms /bin/bash user && echo "user ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
|
||||
|
||||
RUN mkdir -p /var/run/dbus && \
|
||||
chmod 755 /var/run/dbus && \
|
||||
chown user:user /var/run/dbus
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# Copy staged system files and keep sane permissions
|
||||
# -----------------------------------------------------------------------------
|
||||
# 1. Ensure everything under /bytebotd/root is owned by root (files + dirs)
|
||||
# 2. Set *files* to 0644 and *directories* to 0755 so that applications can
|
||||
# traverse directories (execute bit!) while keeping the contents read-only.
|
||||
# 3. Copy the tree to /
|
||||
RUN chown -R root:root /bytebotd/root && \
|
||||
find /bytebotd/root -type f -exec chmod 644 {} + && \
|
||||
find /bytebotd/root -type d -exec chmod 755 {} + && \
|
||||
find /bytebotd/root -type f -executable -exec chmod +x {} + && \
|
||||
cp -a /bytebotd/root/. /
|
||||
|
||||
RUN chown -R user:user /home/user
|
||||
RUN chmod -R 755 /home/user
|
||||
|
||||
RUN mkdir -p /home/user/Desktop && \
|
||||
cp -f /usr/share/applications/firefox.desktop /home/user/Desktop/ && \
|
||||
cp -f /usr/share/applications/thunderbird.desktop /home/user/Desktop/ && \
|
||||
cp -f /usr/share/applications/1password.desktop /home/user/Desktop/ && \
|
||||
cp -f /usr/share/applications/terminal.desktop /home/user/Desktop/ && \
|
||||
chmod +x /home/user/Desktop/*.desktop && \
|
||||
chown user:user /home/user/Desktop/*.desktop
|
||||
|
||||
USER user
|
||||
WORKDIR /home/user
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# 8. Port configuration and runtime
|
||||
# -----------------------------------------------------------------------------
|
||||
# - Port 9990: bytebotd and external noVNC websocket
|
||||
EXPOSE 9990
|
||||
|
||||
# Start supervisor to manage all services
|
||||
CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf", "-n"]
|
||||
@@ -0,0 +1,28 @@
|
||||
{
|
||||
"policies": {
|
||||
"FirefoxHome": {
|
||||
"Search": true,
|
||||
"TopSites": false,
|
||||
"SponsoredTopSites": false,
|
||||
"Highlights": false,
|
||||
"Pocket": false,
|
||||
"SponsoredPocket": false,
|
||||
"Snippets": false,
|
||||
"Locked": true
|
||||
},
|
||||
"SkipTermsOfUse": true,
|
||||
"OfferToSaveLoginsDefault": false,
|
||||
"OfferToSaveLogins": false,
|
||||
"PasswordManagerEnabled": false,
|
||||
"PDFjs": { "Enabled": true, "EnablePermissions": true },
|
||||
"Notifications": { "BlockNewRequests": true, "Locked": true },
|
||||
"UserMessaging": {
|
||||
"ExtensionRecommendations": false,
|
||||
"FeatureRecommendations": false,
|
||||
"UrlbarInterventions": false,
|
||||
"SkipOnboarding": true,
|
||||
"MoreFromMozilla": false,
|
||||
"FirefoxLabs": false
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
[Seat:*]
|
||||
autologin-user=user
|
||||
autologin-user-timeout=0
|
||||
autologin-session=xfce
|
||||
@@ -0,0 +1,18 @@
|
||||
{
|
||||
"policies": {
|
||||
"UserMessaging": {
|
||||
"ExtensionRecommendations": false,
|
||||
"FeatureRecommendations": false,
|
||||
"UrlbarInterventions": false,
|
||||
"SkipOnboarding": true,
|
||||
"MoreFromMozilla": false
|
||||
},
|
||||
"OverrideFirstRunPage": "",
|
||||
"OverridePostUpdatePage": "",
|
||||
"InAppNotification": {
|
||||
"DonationEnabled": false,
|
||||
"SurveyEnabled": false,
|
||||
"MessageEnabled": false
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
[xfdesktop-version-4.10.3+-rcfile_format]
|
||||
4.10.3+=true
|
||||
|
||||
[/home/user/Desktop/firefox.desktop]
|
||||
row=0
|
||||
col=0
|
||||
|
||||
[/home/user/Desktop/thunderbird.desktop]
|
||||
row=1
|
||||
col=0
|
||||
|
||||
[/home/user/Desktop/1password.desktop]
|
||||
row=2
|
||||
col=0
|
||||
|
||||
[/home/user/Desktop/terminal.desktop]
|
||||
row=3
|
||||
col=0
|
||||
|
||||
|
||||
[/home/user]
|
||||
row=4
|
||||
col=0
|
||||
|
||||
|
||||
[Trash]
|
||||
row=5
|
||||
col=0
|
||||
+2
-1
@@ -1,4 +1,5 @@
|
||||
TerminalEmulator=xfce4-terminal
|
||||
WebBrowser=firefox
|
||||
WebBrowser=firefox-esr
|
||||
FileManager=thunar
|
||||
MailReader=thunderbird
|
||||
|
||||
+2
-1
@@ -7,7 +7,7 @@
|
||||
<property name="workspace0" type="empty">
|
||||
<property name="color-style" type="int" value="0"/>
|
||||
<property name="image-style" type="int" value="5"/>
|
||||
<property name="last-image" type="string" value="/usr/share/backgrounds/bytebot/background.jpg"/>
|
||||
<property name="last-image" type="string" value="/usr/share/backgrounds/bytebot-background.jpg"/>
|
||||
</property>
|
||||
</property>
|
||||
</property>
|
||||
@@ -20,5 +20,6 @@
|
||||
<property name="file-icons" type="empty">
|
||||
<property name="show-filesystem" type="bool" value="false"/>
|
||||
</property>
|
||||
<property name="show-tooltips" type="bool" value="false"/>
|
||||
</property>
|
||||
</channel>
|
||||
-2
@@ -12,7 +12,6 @@
|
||||
<property name="icon-size" type="uint" value="16"/>
|
||||
<property name="size" type="uint" value="30"/>
|
||||
<property name="plugin-ids" type="array">
|
||||
<value type="int" value="1"/>
|
||||
<value type="int" value="2"/>
|
||||
<value type="int" value="3"/>
|
||||
<value type="int" value="5"/>
|
||||
@@ -25,7 +24,6 @@
|
||||
</property>
|
||||
</property>
|
||||
<property name="plugins" type="empty">
|
||||
<property name="plugin-1" type="string" value="applicationsmenu"/>
|
||||
<property name="plugin-2" type="string" value="tasklist">
|
||||
<property name="grouping" type="uint" value="1"/>
|
||||
</property>
|
||||
@@ -0,0 +1 @@
|
||||
exec startxfce4
|
||||
@@ -0,0 +1,11 @@
|
||||
[Desktop Entry]
|
||||
Version=1.0
|
||||
Type=Application
|
||||
Name=1Password
|
||||
Comment=Password manager and secure wallet
|
||||
Exec=/usr/bin/1password %U
|
||||
Icon=1password
|
||||
Terminal=false
|
||||
StartupNotify=true
|
||||
Categories=Utility;Security;
|
||||
MimeType=x-scheme-handler/onepassword;
|
||||
@@ -0,0 +1,11 @@
|
||||
[Desktop Entry]
|
||||
Version=1.0
|
||||
Type=Application
|
||||
Name=Firefox Web Browser
|
||||
Comment=Browse the web with Firefox
|
||||
Exec=/usr/bin/firefox-esr %U
|
||||
Icon=firefox-esr
|
||||
Path=
|
||||
Terminal=false
|
||||
StartupNotify=true
|
||||
Categories=Network;WebBrowser;
|
||||
@@ -0,0 +1,11 @@
|
||||
[Desktop Entry]
|
||||
Version=1.0
|
||||
Type=Application
|
||||
Name=Terminal Emulator
|
||||
Comment=Open a terminal
|
||||
Exec=exo-open --launch TerminalEmulator
|
||||
Icon=org.xfce.terminalemulator
|
||||
Path=
|
||||
Terminal=false
|
||||
StartupNotify=true
|
||||
Categories=Utility;TerminalEmulator;
|
||||
@@ -0,0 +1,12 @@
|
||||
[Desktop Entry]
|
||||
Version=1.0
|
||||
Type=Application
|
||||
Name=Thunderbird Mail
|
||||
Comment=Read and send emails with Thunderbird
|
||||
Exec=/usr/bin/thunderbird %U
|
||||
Icon=thunderbird
|
||||
Path=
|
||||
Terminal=false
|
||||
StartupNotify=true
|
||||
Categories=Network;Email;
|
||||
MimeType=x-scheme-handler/mailto;application/x-xpinstall;message/rfc822;
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 2.9 MiB |
Reference in New Issue
Block a user