Compare commits
8 Commits
41b0329fd9
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 4f848d0680 | |||
| cc06731d24 | |||
|
|
0de8039dee | ||
|
|
ff4c2bd6bc | ||
|
|
f72580e7eb | ||
|
|
72673f1b17 | ||
|
|
50b4e98b57 | ||
|
|
600c0af53c |
@@ -82,7 +82,7 @@ changelogs:
|
|||||||
|
|
||||||
### LinuxServer.io Conventions
|
### LinuxServer.io Conventions
|
||||||
- **PUID/PGID:** Support for user mapping is handled by the base image; ensure any new files in `root/` are compatible with the `abc` user.
|
- **PUID/PGID:** Support for user mapping is handled by the base image; ensure any new files in `root/` are compatible with the `abc` user.
|
||||||
- **S6 Overlay:** Use S6 service files for process management if adding new background services. Ensure `run` scripts are executable (`chmod +x`). In this project, an `nginx` service is used to serve local content.
|
- **S6 Overlay:** Use S6 service files for process management if adding new background services. Ensure `run` scripts are executable (`chmod +x`). In this project, the base image's `nginx` service is leveraged to serve local content via `root/etc/nginx/conf.d/fusion.conf`.
|
||||||
|
|
||||||
## 6. Error Handling and Logging
|
## 6. Error Handling and Logging
|
||||||
- **Redirection:** In Shell scripts, redirect stderr to stdout or `/dev/null` as appropriate: `"$@" > /dev/null 2>&1`.
|
- **Redirection:** In Shell scripts, redirect stderr to stdout or `/dev/null` as appropriate: `"$@" > /dev/null 2>&1`.
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ LABEL maintainer="thelamer"
|
|||||||
|
|
||||||
# title
|
# title
|
||||||
ENV TITLE=QMX-Fusion
|
ENV TITLE=QMX-Fusion
|
||||||
ENV CHROME_CLI="--kiosk http://localhost"
|
ENV CHROME_CLI="--kiosk http://localhost:8081"
|
||||||
|
|
||||||
RUN \
|
RUN \
|
||||||
echo "**** add icon ****" && \
|
echo "**** add icon ****" && \
|
||||||
@@ -27,7 +27,6 @@ RUN \
|
|||||||
echo "**** clone web content ****" && \
|
echo "**** clone web content ****" && \
|
||||||
git clone https://github.com/Sparks72/QMX-Fusion-v1 /var/www/fusion-v1 && \
|
git clone https://github.com/Sparks72/QMX-Fusion-v1 /var/www/fusion-v1 && \
|
||||||
chown -R abc:abc /var/www/fusion-v1 && \
|
chown -R abc:abc /var/www/fusion-v1 && \
|
||||||
rm -f /etc/nginx/sites-enabled/default && \
|
|
||||||
echo "**** cleanup ****" && \
|
echo "**** cleanup ****" && \
|
||||||
apt-get autoclean && \
|
apt-get autoclean && \
|
||||||
rm -rf \
|
rm -rf \
|
||||||
@@ -40,6 +39,6 @@ RUN \
|
|||||||
COPY /root /
|
COPY /root /
|
||||||
|
|
||||||
# ports and volumes
|
# ports and volumes
|
||||||
EXPOSE 3000
|
EXPOSE 3000 3001
|
||||||
|
|
||||||
VOLUME /config
|
VOLUME /config
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ LABEL maintainer="thelamer"
|
|||||||
|
|
||||||
# title
|
# title
|
||||||
ENV TITLE=QMX-Fusion
|
ENV TITLE=QMX-Fusion
|
||||||
ENV CHROME_CLI="--kiosk http://localhost"
|
ENV CHROME_CLI="--kiosk http://localhost:8081"
|
||||||
|
|
||||||
RUN \
|
RUN \
|
||||||
echo "**** add icon ****" && \
|
echo "**** add icon ****" && \
|
||||||
@@ -27,7 +27,6 @@ RUN \
|
|||||||
echo "**** clone web content ****" && \
|
echo "**** clone web content ****" && \
|
||||||
git clone https://github.com/Sparks72/QMX-Fusion-v1 /var/www/fusion-v1 && \
|
git clone https://github.com/Sparks72/QMX-Fusion-v1 /var/www/fusion-v1 && \
|
||||||
chown -R abc:abc /var/www/fusion-v1 && \
|
chown -R abc:abc /var/www/fusion-v1 && \
|
||||||
rm -f /etc/nginx/sites-enabled/default && \
|
|
||||||
echo "**** cleanup ****" && \
|
echo "**** cleanup ****" && \
|
||||||
apt-get autoclean && \
|
apt-get autoclean && \
|
||||||
rm -rf \
|
rm -rf \
|
||||||
@@ -40,6 +39,6 @@ RUN \
|
|||||||
COPY /root /
|
COPY /root /
|
||||||
|
|
||||||
# ports and volumes
|
# ports and volumes
|
||||||
EXPOSE 3000
|
EXPOSE 3000 3001
|
||||||
|
|
||||||
VOLUME /config
|
VOLUME /config
|
||||||
|
|||||||
@@ -1,3 +1,9 @@
|
|||||||
|
Containerization of QMX-fusion based on linuxserver/chromium
|
||||||
|
|
||||||
|
```docer compose up -d```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
<!-- DO NOT EDIT THIS FILE MANUALLY -->
|
<!-- DO NOT EDIT THIS FILE MANUALLY -->
|
||||||
<!-- Please read https://github.com/linuxserver/docker-chromium/blob/master/.github/CONTRIBUTING.md -->
|
<!-- Please read https://github.com/linuxserver/docker-chromium/blob/master/.github/CONTRIBUTING.md -->
|
||||||
[](https://linuxserver.io)
|
[](https://linuxserver.io)
|
||||||
|
|||||||
18
docker-compose.yaml
Normal file
18
docker-compose.yaml
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
---
|
||||||
|
services:
|
||||||
|
qmx-fusion:
|
||||||
|
build: .
|
||||||
|
image: sa6anw/qmx-fusion:latest
|
||||||
|
container_name: qmx-fusion
|
||||||
|
environment:
|
||||||
|
- PUID=1000
|
||||||
|
- PGID=1000
|
||||||
|
- TZ=Etc/UTC
|
||||||
|
- CHROME_CLI=--kiosk http://localhost:8081 # Uppdatera om du vill ändra startinställningar
|
||||||
|
volumes:
|
||||||
|
- ./config:/config
|
||||||
|
ports:
|
||||||
|
- 3010:3000
|
||||||
|
- 3011:3001
|
||||||
|
shm_size: "1gb"
|
||||||
|
restart: unless-stopped
|
||||||
@@ -32,7 +32,7 @@ custom_params:
|
|||||||
# optional variables
|
# optional variables
|
||||||
opt_param_usage_include_env: true
|
opt_param_usage_include_env: true
|
||||||
opt_param_env_vars:
|
opt_param_env_vars:
|
||||||
- {env_var: "CHROME_CLI", env_value: "--kiosk http://localhost", desc: "Specify one or multiple Chromium CLI flags, this string will be passed to the application in full."}
|
- {env_var: "CHROME_CLI", env_value: "--kiosk http://localhost:8081", desc: "Specify one or multiple Chromium CLI flags, this string will be passed to the application in full."}
|
||||||
# Selkies blurb settings
|
# Selkies blurb settings
|
||||||
selkies_blurb: true
|
selkies_blurb: true
|
||||||
show_nvidia: true
|
show_nvidia: true
|
||||||
@@ -114,6 +114,7 @@ init_diagram: |
|
|||||||
"chromium:latest" <- Base Images
|
"chromium:latest" <- Base Images
|
||||||
# changelog
|
# changelog
|
||||||
changelogs:
|
changelogs:
|
||||||
|
- {date: "06.01.26:", desc: "Fix missing port 3001, ensure autostart is executable, and restore default nginx site to avoid breaking Selkies UI."}
|
||||||
- {date: "06.01.26:", desc: "Add nginx to serve QMX-Fusion-v1 and start chromium in kiosk mode."}
|
- {date: "06.01.26:", desc: "Add nginx to serve QMX-Fusion-v1 and start chromium in kiosk mode."}
|
||||||
- {date: "20.12.25:", desc: "Add Wayland init logic."}
|
- {date: "20.12.25:", desc: "Add Wayland init logic."}
|
||||||
- {date: "22.09.25:", desc: "Rebase to Debian Trixie."}
|
- {date: "22.09.25:", desc: "Rebase to Debian Trixie."}
|
||||||
|
|||||||
0
root/defaults/autostart
Normal file → Executable file
0
root/defaults/autostart
Normal file → Executable file
0
root/defaults/autostart_wayland
Normal file → Executable file
0
root/defaults/autostart_wayland
Normal file → Executable file
@@ -1,5 +1,5 @@
|
|||||||
server {
|
server {
|
||||||
listen 80 default_server;
|
listen 8081;
|
||||||
root /var/www/fusion-v1;
|
root /var/www/fusion-v1;
|
||||||
index index.html;
|
index index.html;
|
||||||
location / {
|
location / {
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
#!/usr/bin/with-contenv bash
|
|
||||||
exec nginx -g "daemon off;"
|
|
||||||
Reference in New Issue
Block a user