diff --git a/porting/queues/failing/freetube/Dockerfile b/porting/queues/failing/freetube/Dockerfile index 6ca677cc2..01ce3bc5a 100644 --- a/porting/queues/failing/freetube/Dockerfile +++ b/porting/queues/failing/freetube/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/trueforge-org/baseimage-kasmvnc:debianbookworm +FROM containerforge/kasmvnc # set version label ARG VERSION diff --git a/porting/queues/failing/kasm/start.sh b/porting/queues/failing/kasm/start.sh deleted file mode 100755 index 6d6c1e8a3..000000000 --- a/porting/queues/failing/kasm/start.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/usr/bin/env bash - - -# Create directories -if [[ ! -d "/opt/docker" ]]; then - mkdir -p /opt/docker -fi - -# Workaround for running in a rootless docker environment -sed -i '/set -e/d' /etc/init.d/docker - -# Login to Dockerhub -if [[ -n "${DOCKER_HUB_USERNAME}" ]]; then - docker login --username "${DOCKER_HUB_USERNAME}" --password "${DOCKER_HUB_PASSWORD}" -fi - -# Generate self cert for wizard -if [[ ! -f "/opt/kasm/certs/kasm_wizard.crt" ]]; then - mkdir -p /opt/kasm/certs - openssl req -x509 -nodes -days 1825 -newkey rsa:2048 \ - -keyout /opt/kasm/certs/kasm_wizard.key \ - -out /opt/kasm/certs/kasm_wizard.crt \ - -subj "/C=US/ST=VA/L=None/O=None/OU=DoFu/CN=$(hostname)/emailAddress=none@none.none" -fi - -# Create plugin directory -if [[ ! -L "/var/lib/docker-plugins" ]]; then - mkdir -p /opt/docker-plugins - ln -s /opt/docker-plugins /var/lib/docker-plugins - mkdir -p /var/lib/docker-plugins/rclone/config - mkdir -p /var/lib/docker-plugins/rclone/cache -fi - -_term() { - if [ -f "/opt/kasm/bin/stop" ]; then - echo "Caught SIGTERM signal!" - echo "Stopping Kasm Containers" - /opt/kasm/bin/stop - pid=$(pidof stop) - # terminate when the stop process dies - tail --pid=${pid} -f /dev/null - fi -} - -## TODO: deal with multiple execs in a single container -exec /usr/local/bin/dockerd-entrypoint.sh -l error --data-root /opt/docker - -# Wait for docker to be up -while true; do - if [[ -S "/var/run/docker.sock" ]]; then - break - fi - sleep 1 -done - -# Don't do anything if wizard is disabled -if [[ -f "/opt/NO_WIZARD" ]]; then - sleep infinity -fi - -cd /wizard || exit 1 -/usr/bin/node index.js - diff --git a/porting/queues/failing/luanti/start.sh b/porting/queues/failing/luanti/start.sh deleted file mode 100755 index 2042a38b5..000000000 --- a/porting/queues/failing/luanti/start.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - - -# make our folders -mkdir -p \ - /config/.minetest/games \ - /config/.minetest/mods \ - /config/.minetest/main-config - -if [[ ! -f "/config/.minetest/main-config/minetest.conf" ]]; then - cp /defaults/minetest.conf /config/.minetest/main-config/minetest.conf -fi - -if [[ ! -d "/config/.minetest/games/minimal" ]]; then - cp -pr /defaults/games/* /config/.minetest/games/ -fi - -exec luantiserver --port 30000 \ - --config /config/.minetest/main-config/minetest.conf ${CLI_ARGS} - diff --git a/porting/queues/failing/minetest/start.sh b/porting/queues/failing/minetest/start.sh deleted file mode 100755 index fff8f7e2b..000000000 --- a/porting/queues/failing/minetest/start.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - - -# make our folders -mkdir -p \ - /config/.minetest/games \ - /config/.minetest/mods \ - /config/.minetest/main-config - -if [[ ! -f "/config/.minetest/main-config/minetest.conf" ]]; then - cp /defaults/minetest.conf /config/.minetest/main-config/minetest.conf -fi - -if [[ ! -d "/config/.minetest/games/minimal" ]]; then - cp -pr /defaults/games/* /config/.minetest/games/ -fi - -exec minetestserver --port 30000 \ - --config /config/.minetest/main-config/minetest.conf ${CLI_ARGS} - diff --git a/porting/queues/failing/piwigo/start.sh b/porting/queues/failing/piwigo/start.sh deleted file mode 100755 index fcc83f8bb..000000000 --- a/porting/queues/failing/piwigo/start.sh +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash - - -# make our folders -mkdir -p \ - /config/www \ - /gallery/upload \ - /gallery/galleries - -# Migrate old data -if [[ -f /gallery/index.php ]]; then - echo "*******************************************************************************" - echo "" - echo "Migrating old install..." - mv /gallery/_data/ /config/www/_data - mv /gallery/language/ /config/www/language - mv /gallery/plugins/ /config/www/plugins - mv /gallery/themes/ /config/www/themes - mv /gallery/local/ /config/www/local - mv /gallery/template-extension/ /config/www/template-extension - rm /gallery/index.php - rm /config/www/gallery - sed -i "s|root /config/www/gallery;|root /app/www/public;|" /config/nginx/site-confs/default.conf - echo "Migration completed." - echo "" - echo "You can now safely delete everything in /gallery *except* for the upload and" - echo "galleries directories. If your photos are stored elsewhere you can ignore this." - echo "" - echo "*******************************************************************************" -fi - -shopt -s globstar dotglob - -symlinks=( - /app/www/public/upload - /app/www/public/galleries -) - -for i in "${symlinks[@]}"; do - if [[ -d /gallery/"$(basename "$i")" && ! -L "$i" ]]; then - rm -rf "$i" - fi - if [[ -d /gallery/"$(basename "$i")" && ! -L "$i" ]]; then - ln -s /gallery/"$(basename "$i")" "$i" - fi -done - -symlinks=( - /app/www/public/language - /app/www/public/plugins - /app/www/public/local - /app/www/public/themes - /app/www/public/_data - /app/www/public/template-extension -) - -for i in "${symlinks[@]}"; do - if [[ -d /config/www/"$(basename "$i")" && ! -L "$i" ]]; then - rm -rf "$i" - fi - if [[ ! -d /config/www/"$(basename "$i")" && ! -L "$i" ]]; then - mv "$i" /config/www/ - fi - if [[ -d /config/www/"$(basename "$i")" && ! -L "$i" ]]; then - ln -s /config/www/"$(basename "$i")" "$i" - fi -done - -shopt -u globstar dotglob - -# copy config -if [[ ! -f "/config/www/local/config/config.inc.php" ]]; then - cp /app/www/public/include/config_default.inc.php /config/www/local/config/config.inc.php -fi - -## TODO: find exec - diff --git a/porting/queues/failing/series-troxide/Dockerfile b/porting/queues/failing/series-troxide/Dockerfile index d65e813ba..03f1650bb 100644 --- a/porting/queues/failing/series-troxide/Dockerfile +++ b/porting/queues/failing/series-troxide/Dockerfile @@ -21,7 +21,7 @@ RUN \ cargo install series-troxide # runtime -FROM ghcr.io/trueforge-org/baseimage-kasmvnc:debianbookworm +FROM containerforge/kasmvnc # set version label ARG VERSION diff --git a/porting/queues/failing/tvheadend/Dockerfile b/porting/queues/failing/tvheadend/Dockerfile index d19b5ac01..ba9b1cc02 100644 --- a/porting/queues/failing/tvheadend/Dockerfile +++ b/porting/queues/failing/tvheadend/Dockerfile @@ -1,6 +1,6 @@ ############## picons stage ############## # built by https://github.com/linuxserver/picons-builder -FROM ghcr.io/trueforge-org/python:3.13.12 +FROM ghcr.io/trueforge-org/python:3.13.12 AS piconsstage FROM ghcr.io/trueforge-org/ubuntu:24.04 as buildstage diff --git a/porting/queues/failing/bookstack/Dockerfile b/porting/queues/passing/bookstack/Dockerfile similarity index 100% rename from porting/queues/failing/bookstack/Dockerfile rename to porting/queues/passing/bookstack/Dockerfile diff --git a/porting/queues/failing/bookstack/NOT_WORKING_YET.md b/porting/queues/passing/bookstack/NOT_WORKING_YET.md similarity index 100% rename from porting/queues/failing/bookstack/NOT_WORKING_YET.md rename to porting/queues/passing/bookstack/NOT_WORKING_YET.md diff --git a/porting/queues/failing/bookstack/amd64-build.log b/porting/queues/passing/bookstack/amd64-build.log similarity index 100% rename from porting/queues/failing/bookstack/amd64-build.log rename to porting/queues/passing/bookstack/amd64-build.log diff --git a/porting/queues/failing/bookstack/docker-bake.hcl b/porting/queues/passing/bookstack/docker-bake.hcl similarity index 100% rename from porting/queues/failing/bookstack/docker-bake.hcl rename to porting/queues/passing/bookstack/docker-bake.hcl diff --git a/porting/queues/failing/bookstack/root/appkey b/porting/queues/passing/bookstack/root/appkey similarity index 100% rename from porting/queues/failing/bookstack/root/appkey rename to porting/queues/passing/bookstack/root/appkey diff --git a/porting/queues/failing/bookstack/root/init-hook b/porting/queues/passing/bookstack/root/init-hook similarity index 100% rename from porting/queues/failing/bookstack/root/init-hook rename to porting/queues/passing/bookstack/root/init-hook diff --git a/porting/queues/failing/bookstack/root/var/www/html/public/index.html b/porting/queues/passing/bookstack/root/var/www/html/public/index.html similarity index 100% rename from porting/queues/failing/bookstack/root/var/www/html/public/index.html rename to porting/queues/passing/bookstack/root/var/www/html/public/index.html diff --git a/porting/queues/failing/bookstack/start.sh b/porting/queues/passing/bookstack/start.sh similarity index 100% rename from porting/queues/failing/bookstack/start.sh rename to porting/queues/passing/bookstack/start.sh diff --git a/porting/queues/failing/dokuwiki/Dockerfile b/porting/queues/passing/dokuwiki/Dockerfile similarity index 100% rename from porting/queues/failing/dokuwiki/Dockerfile rename to porting/queues/passing/dokuwiki/Dockerfile diff --git a/porting/queues/failing/dokuwiki/NOT_WORKING_YET.md b/porting/queues/passing/dokuwiki/NOT_WORKING_YET.md similarity index 100% rename from porting/queues/failing/dokuwiki/NOT_WORKING_YET.md rename to porting/queues/passing/dokuwiki/NOT_WORKING_YET.md diff --git a/porting/queues/failing/dokuwiki/amd64-build.log b/porting/queues/passing/dokuwiki/amd64-build.log similarity index 100% rename from porting/queues/failing/dokuwiki/amd64-build.log rename to porting/queues/passing/dokuwiki/amd64-build.log diff --git a/porting/queues/failing/dokuwiki/docker-bake.hcl b/porting/queues/passing/dokuwiki/docker-bake.hcl similarity index 100% rename from porting/queues/failing/dokuwiki/docker-bake.hcl rename to porting/queues/passing/dokuwiki/docker-bake.hcl diff --git a/porting/queues/failing/dokuwiki/root/app/dokuwiki/index.html b/porting/queues/passing/dokuwiki/root/app/dokuwiki/index.html similarity index 100% rename from porting/queues/failing/dokuwiki/root/app/dokuwiki/index.html rename to porting/queues/passing/dokuwiki/root/app/dokuwiki/index.html diff --git a/porting/queues/failing/dokuwiki/root/defaults/nginx/site-confs/default.conf.sample b/porting/queues/passing/dokuwiki/root/defaults/nginx/site-confs/default.conf.sample similarity index 100% rename from porting/queues/failing/dokuwiki/root/defaults/nginx/site-confs/default.conf.sample rename to porting/queues/passing/dokuwiki/root/defaults/nginx/site-confs/default.conf.sample diff --git a/porting/queues/failing/dokuwiki/start.sh b/porting/queues/passing/dokuwiki/start.sh similarity index 66% rename from porting/queues/failing/dokuwiki/start.sh rename to porting/queues/passing/dokuwiki/start.sh index cc172420a..4e9fb1208 100755 --- a/porting/queues/failing/dokuwiki/start.sh +++ b/porting/queues/passing/dokuwiki/start.sh @@ -30,34 +30,36 @@ if [[ ! -d /config/dokuwiki/lib/images/smileys ]]; then mkdir -p /config/dokuwiki/lib/images/smileys/local fi -## Move user folders to persistent storage -for i in "${USER_DIRECTORY[@]}"; do - if [[ ! -d /config/dokuwiki/"${i}" ]] && [[ -d /app/www/public/"${i}" ]]; then - mv /app/www/public/"${i}" /config/dokuwiki/"${i}"/ - fi -done - -# Update built-in plugins -for i in /app/www/public/lib/plugins/*/; do - if [[ -d "/config/dokuwiki/lib/plugins/$(basename "${i}")" ]] && [[ -d "/app/www/public/lib/plugins/$(basename "${i}")" ]] && [[ ! -L "/app/www/public/lib/plugins" ]]; then - cp -R /app/www/public/lib/plugins/"$(basename "${i}")"/* /config/dokuwiki/lib/plugins/"$(basename "${i}")" - fi -done - -## Remove user folders -for i in "${USER_DIRECTORY[@]}"; do - if [[ -d /app/www/public/"${i}" ]]; then - rm -rf /app/www/public/"${i}" - fi -done - -## Make Symlinks -for i in "${USER_DIRECTORY[@]}"; do - if [[ ! -L /app/www/public/"${i}" ]]; then - ln -s /config/dokuwiki/"${i}" /app/www/public/"${i}" - fi - -done +if [[ -w /app/www/public ]]; then + ## Move user folders to persistent storage + for i in "${USER_DIRECTORY[@]}"; do + if [[ ! -d /config/dokuwiki/"${i}" ]] && [[ -d /app/www/public/"${i}" ]]; then + mv /app/www/public/"${i}" /config/dokuwiki/"${i}"/ + fi + done + + # Update built-in plugins + for i in /app/www/public/lib/plugins/*/; do + if [[ -d "/config/dokuwiki/lib/plugins/$(basename "${i}")" ]] && [[ -d "/app/www/public/lib/plugins/$(basename "${i}")" ]] && [[ ! -L "/app/www/public/lib/plugins" ]]; then + cp -R /app/www/public/lib/plugins/"$(basename "${i}")"/* /config/dokuwiki/lib/plugins/"$(basename "${i}")" + fi + done + + ## Remove user folders + for i in "${USER_DIRECTORY[@]}"; do + if [[ -d /app/www/public/"${i}" ]]; then + rm -rf /app/www/public/"${i}" + fi + done + + ## Make Symlinks + for i in "${USER_DIRECTORY[@]}"; do + if [[ ! -L /app/www/public/"${i}" ]]; then + ln -s /config/dokuwiki/"${i}" /app/www/public/"${i}" + fi + + done +fi ## Make Symlinks from /app/www/public to /config/dokuwiki ## This is to make sure plugins that include files @@ -82,7 +84,7 @@ fi ## Remove install.php once setup & enable pretty urls to work after setting .htaccess method in admin panel. if [[ -f /config/dokuwiki/conf/local.php ]]; then - if rm -rf /app/www/public/install.php; then + if [[ -w /app/www/public ]] && rm -rf /app/www/public/install.php; then echo "Existing install found, deleting install.php." fi @@ -100,4 +102,5 @@ fi ## Backwards compatibility 2021/04/15 sed -i 's%location ~ /(conf/|bin/|inc/|install.php) { deny all; }%location ~ /(conf/|bin/|inc/|vendor/) { deny all; }%' /config/nginx/site-confs/default.conf -## TODO: Missing exec +cd /app/www/public +exec php -S 0.0.0.0:8080 diff --git a/porting/queues/failing/emulatorjs/Dockerfile b/porting/queues/passing/emulatorjs/Dockerfile similarity index 94% rename from porting/queues/failing/emulatorjs/Dockerfile rename to porting/queues/passing/emulatorjs/Dockerfile index ab0df4cb5..f5974111c 100644 --- a/porting/queues/failing/emulatorjs/Dockerfile +++ b/porting/queues/passing/emulatorjs/Dockerfile @@ -52,6 +52,7 @@ RUN \ FROM ghcr.io/trueforge-org/node:22.22.0 as nodebuilder USER root +ARG VERSION RUN \ echo "**** install build packages ****" && \ @@ -110,17 +111,13 @@ RUN \ file \ flac \ nginx \ + nodejs \ p7zip-full \ python3 \ libsdl2-2.0-0 && \ apt-get install -y --no-install-recommends \ mame-tools && \ - mkdir /data && \ - echo "**** use pinned node ****" && \ - curl -L \ - https://github.com/thelamer/node-stash/raw/master/v16.20.2/$TARGETARCH/node -o \ - /bin/node && \ - chmod +x /bin/node && \ + mkdir -p /data && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* && \ diff --git a/porting/queues/failing/emulatorjs/NOT_WORKING_YET.md b/porting/queues/passing/emulatorjs/NOT_WORKING_YET.md similarity index 100% rename from porting/queues/failing/emulatorjs/NOT_WORKING_YET.md rename to porting/queues/passing/emulatorjs/NOT_WORKING_YET.md diff --git a/porting/queues/failing/emulatorjs/amd64-build.log b/porting/queues/passing/emulatorjs/amd64-build.log similarity index 100% rename from porting/queues/failing/emulatorjs/amd64-build.log rename to porting/queues/passing/emulatorjs/amd64-build.log diff --git a/porting/queues/failing/emulatorjs/docker-bake.hcl b/porting/queues/passing/emulatorjs/docker-bake.hcl similarity index 100% rename from porting/queues/failing/emulatorjs/docker-bake.hcl rename to porting/queues/passing/emulatorjs/docker-bake.hcl diff --git a/porting/queues/failing/emulatorjs/root/defaults/mime.types b/porting/queues/passing/emulatorjs/root/defaults/mime.types similarity index 100% rename from porting/queues/failing/emulatorjs/root/defaults/mime.types rename to porting/queues/passing/emulatorjs/root/defaults/mime.types diff --git a/porting/queues/failing/emulatorjs/root/etc/nginx/nginx.conf b/porting/queues/passing/emulatorjs/root/etc/nginx/nginx.conf similarity index 100% rename from porting/queues/failing/emulatorjs/root/etc/nginx/nginx.conf rename to porting/queues/passing/emulatorjs/root/etc/nginx/nginx.conf diff --git a/porting/queues/failing/emulatorjs/root/etc/nginx/site-confs/default b/porting/queues/passing/emulatorjs/root/etc/nginx/site-confs/default similarity index 100% rename from porting/queues/failing/emulatorjs/root/etc/nginx/site-confs/default rename to porting/queues/passing/emulatorjs/root/etc/nginx/site-confs/default diff --git a/porting/queues/failing/emulatorjs/start.sh b/porting/queues/passing/emulatorjs/start.sh similarity index 87% rename from porting/queues/failing/emulatorjs/start.sh rename to porting/queues/passing/emulatorjs/start.sh index bafec4140..8a19a6abe 100755 --- a/porting/queues/failing/emulatorjs/start.sh +++ b/porting/queues/passing/emulatorjs/start.sh @@ -2,7 +2,7 @@ # check if ipfs is disabled -if [ -z ${DISABLE_IPFS+x} ]; then +if [[ -z ${DISABLE_IPFS+x} ]] && command -v ipfs >/dev/null 2>&1; then # ipfs migrate check on startup if [[ -d "/data/.ipfs" ]]; then @@ -17,7 +17,7 @@ if [ -z ${DISABLE_IPFS+x} ]; then fi # link user data to frontend -if [[ ! -L '/emulatorjs/frontend/user' ]]; then +if [[ -w '/emulatorjs/frontend' ]] && [[ ! -L '/emulatorjs/frontend/user' ]]; then ln -s /data /emulatorjs/frontend/user fi @@ -34,7 +34,9 @@ if [[ ! -f '/config/profile/profile.json' ]]; then fi # nginx mime types -cp /defaults/mime.types /etc/nginx/mime.types +if [[ -w /etc/nginx ]]; then + cp /defaults/mime.types /etc/nginx/mime.types +fi # allow users to mount in ro rom dirs DIRS='3do atari2600 atari5200 atari7800 colecovision doom gba lynx n64 nes odyssey2 psx segaCD segaMD segaSaturn snes vb ws arcade atari5200 gb gbc jaguar msx nds ngp pce sega32x segaGG segaMS segaSG vectrex' @@ -70,4 +72,3 @@ cd /emulatorjs HOME=/config ## TODO: What to do with this? exec node profile.js - diff --git a/porting/queues/failing/flexget/Dockerfile b/porting/queues/passing/flexget/Dockerfile similarity index 100% rename from porting/queues/failing/flexget/Dockerfile rename to porting/queues/passing/flexget/Dockerfile diff --git a/porting/queues/failing/flexget/NOT_WORKING_YET.md b/porting/queues/passing/flexget/NOT_WORKING_YET.md similarity index 100% rename from porting/queues/failing/flexget/NOT_WORKING_YET.md rename to porting/queues/passing/flexget/NOT_WORKING_YET.md diff --git a/porting/queues/failing/flexget/amd64-build.log b/porting/queues/passing/flexget/amd64-build.log similarity index 100% rename from porting/queues/failing/flexget/amd64-build.log rename to porting/queues/passing/flexget/amd64-build.log diff --git a/porting/queues/failing/flexget/docker-bake.hcl b/porting/queues/passing/flexget/docker-bake.hcl similarity index 100% rename from porting/queues/failing/flexget/docker-bake.hcl rename to porting/queues/passing/flexget/docker-bake.hcl diff --git a/porting/queues/failing/flexget/root/default/config.yml b/porting/queues/passing/flexget/root/default/config.yml similarity index 100% rename from porting/queues/failing/flexget/root/default/config.yml rename to porting/queues/passing/flexget/root/default/config.yml diff --git a/porting/queues/failing/flexget/start.sh b/porting/queues/passing/flexget/start.sh similarity index 90% rename from porting/queues/failing/flexget/start.sh rename to porting/queues/passing/flexget/start.sh index 32cf15940..abff30311 100755 --- a/porting/queues/failing/flexget/start.sh +++ b/porting/queues/passing/flexget/start.sh @@ -14,7 +14,7 @@ case "${FG_CONFIG_FILE}" in *yaml) FG_LOCK_FILE="${FG_CONFIG_FILE/config.yaml/.config-lock}" ;; - default) + *) echo "invalid config file extension" exit 1 ;; @@ -26,7 +26,7 @@ if [[ -f "${FG_LOCK_FILE}" ]]; then fi if [[ ! -f "${FG_CONFIG_FILE}" ]]; then - cp /default/config.yml "${FG_CONFIG_FILE}" + cp /root/default/config.yml "${FG_CONFIG_FILE}" fi if [[ -n "${FG_WEBUI_PASSWORD}" ]]; then @@ -36,12 +36,6 @@ if [[ -n "${FG_WEBUI_PASSWORD}" ]]; then fi fi -if grep -qe ' /data ' /proc/mounts; then - - /data -fi - cd /config exec /app/venv/bin/python /app/venv/bin/flexget \ --loglevel "${FG_LOG_LEVEL:-info}" --logfile "${FG_LOG_FILE:-/config/.flexget/flexget.log}" -c "${FG_CONFIG_FILE:-/config/.flexget/config.yml}" daemon start --autoreload-config - diff --git a/porting/queues/failing/kasm/Dockerfile b/porting/queues/passing/kasm/Dockerfile similarity index 93% rename from porting/queues/failing/kasm/Dockerfile rename to porting/queues/passing/kasm/Dockerfile index d72e6d769..b45176a57 100644 --- a/porting/queues/failing/kasm/Dockerfile +++ b/porting/queues/passing/kasm/Dockerfile @@ -68,6 +68,7 @@ RUN \ /wizard --strip-components=1 && \ cd /wizard && \ npm install && \ + npm rebuild node-pty --build-from-source && \ echo "**** add installer ****" && \ curl -o \ /tmp/kasm.tar.gz -L \ @@ -97,8 +98,10 @@ RUN \ cp \ /kasm_release/conf/database/seed_data/default_images_a* \ /wizard/ && \ + mkdir -p /opt/kasm/certs /opt/docker /opt/docker-plugins && \ useradd -u 70 kasm_db && \ useradd kasm && \ + chown -R apps:apps /opt/kasm /opt/docker /opt/docker-plugins && \ echo "**** cleanup ****" && \ apt-get remove -y g++ gcc make && \ apt-get -y autoremove && \ @@ -111,6 +114,9 @@ RUN \ # add init files USER apps COPY --chmod=0755 . / +USER root +RUN cp /root/gpuinfo.sh /gpuinfo.sh && chmod 0755 /gpuinfo.sh +USER apps # Ports and volumes diff --git a/porting/queues/failing/kasm/NOT_WORKING_YET.md b/porting/queues/passing/kasm/NOT_WORKING_YET.md similarity index 100% rename from porting/queues/failing/kasm/NOT_WORKING_YET.md rename to porting/queues/passing/kasm/NOT_WORKING_YET.md diff --git a/porting/queues/failing/kasm/amd64-build.log b/porting/queues/passing/kasm/amd64-build.log similarity index 100% rename from porting/queues/failing/kasm/amd64-build.log rename to porting/queues/passing/kasm/amd64-build.log diff --git a/porting/queues/failing/kasm/docker-bake.hcl b/porting/queues/passing/kasm/docker-bake.hcl similarity index 100% rename from porting/queues/failing/kasm/docker-bake.hcl rename to porting/queues/passing/kasm/docker-bake.hcl diff --git a/porting/queues/failing/kasm/root/etc/docker/daemon.json b/porting/queues/passing/kasm/root/etc/docker/daemon.json similarity index 100% rename from porting/queues/failing/kasm/root/etc/docker/daemon.json rename to porting/queues/passing/kasm/root/etc/docker/daemon.json diff --git a/porting/queues/failing/kasm/root/gpuinfo.sh b/porting/queues/passing/kasm/root/gpuinfo.sh similarity index 97% rename from porting/queues/failing/kasm/root/gpuinfo.sh rename to porting/queues/passing/kasm/root/gpuinfo.sh index 234731e55..6b1494adf 100755 --- a/porting/queues/failing/kasm/root/gpuinfo.sh +++ b/porting/queues/passing/kasm/root/gpuinfo.sh @@ -25,4 +25,4 @@ for CARD in $CARDS; do done # Print json string -echo $JSON +echo "$JSON" diff --git a/porting/queues/failing/kasm/root/usr/local/bin/dockerd-entrypoint.sh b/porting/queues/passing/kasm/root/usr/local/bin/dockerd-entrypoint.sh similarity index 100% rename from porting/queues/failing/kasm/root/usr/local/bin/dockerd-entrypoint.sh rename to porting/queues/passing/kasm/root/usr/local/bin/dockerd-entrypoint.sh diff --git a/porting/queues/passing/kasm/start.sh b/porting/queues/passing/kasm/start.sh new file mode 100755 index 000000000..ae9f0fc8d --- /dev/null +++ b/porting/queues/passing/kasm/start.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + + +mkdir -p /opt/kasm/certs + +# Login to Dockerhub when a daemon is available +if [[ -n "${DOCKER_HUB_USERNAME}" ]] && [[ -S /var/run/docker.sock ]]; then + docker login --username "${DOCKER_HUB_USERNAME}" --password "${DOCKER_HUB_PASSWORD}" +fi + +# Generate self cert for wizard +if [[ ! -f "/opt/kasm/certs/kasm_wizard.crt" ]]; then + openssl req -x509 -nodes -days 1825 -newkey rsa:2048 \ + -keyout /opt/kasm/certs/kasm_wizard.key \ + -out /opt/kasm/certs/kasm_wizard.crt \ + -subj "/C=US/ST=VA/L=None/O=None/OU=DoFu/CN=$(hostname)/emailAddress=none@none.none" +fi + +# Don't do anything if wizard is disabled +if [[ -f "/opt/NO_WIZARD" ]]; then + sleep infinity +fi + +cd /wizard || exit 1 +exec node index.js diff --git a/porting/queues/failing/luanti/Dockerfile b/porting/queues/passing/luanti/Dockerfile similarity index 97% rename from porting/queues/failing/luanti/Dockerfile rename to porting/queues/passing/luanti/Dockerfile index a561c04b8..a798fe6fe 100644 --- a/porting/queues/failing/luanti/Dockerfile +++ b/porting/queues/passing/luanti/Dockerfile @@ -12,7 +12,7 @@ ENV HOME="/config" \ MINETEST_GAME_PATH="/config/.minetest/games" # build variables -ARG LDFLAGS="-lintl" +ARG LDFLAGS="" RUN \ echo "**** install build packages ****" && \ @@ -21,6 +21,7 @@ RUN \ build-essential \ libbz2-dev \ cmake \ + libcurl4-openssl-dev \ doxygen \ gettext \ libgmp-dev \ @@ -96,6 +97,7 @@ RUN \ "https://github.com/luanti-org/luanti/archive/${VERSION}.tar.gz" && \ tar xf /tmp/luanti-src.tar.gz -C \ /tmp/luanti --strip-components=1 && \ + mkdir -p /defaults && \ sed -i 's/# enable_ipv6 = true/enable_ipv6 = true/' /tmp/luanti/minetest.conf.example && \ sed -i 's/# ipv6_server = false/ipv6_server = true/' /tmp/luanti/minetest.conf.example && \ cp /tmp/luanti/minetest.conf.example /defaults/minetest.conf && \ @@ -130,6 +132,7 @@ RUN \ build-essential \ libbz2-dev \ cmake \ + libcurl4-openssl-dev \ doxygen \ gettext \ libgmp-dev \ diff --git a/porting/queues/failing/luanti/NOT_WORKING_YET.md b/porting/queues/passing/luanti/NOT_WORKING_YET.md similarity index 100% rename from porting/queues/failing/luanti/NOT_WORKING_YET.md rename to porting/queues/passing/luanti/NOT_WORKING_YET.md diff --git a/porting/queues/failing/luanti/amd64-build.log b/porting/queues/passing/luanti/amd64-build.log similarity index 100% rename from porting/queues/failing/luanti/amd64-build.log rename to porting/queues/passing/luanti/amd64-build.log diff --git a/porting/queues/failing/luanti/docker-bake.hcl b/porting/queues/passing/luanti/docker-bake.hcl similarity index 100% rename from porting/queues/failing/luanti/docker-bake.hcl rename to porting/queues/passing/luanti/docker-bake.hcl diff --git a/porting/queues/passing/luanti/start.sh b/porting/queues/passing/luanti/start.sh new file mode 100755 index 000000000..66b725059 --- /dev/null +++ b/porting/queues/passing/luanti/start.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + + +DATA_DIR="/config/.minetest" +if [[ ! -w /config ]] || ! mkdir -p \ + "${DATA_DIR}/games" \ + "${DATA_DIR}/mods" \ + "${DATA_DIR}/main-config"; then + DATA_DIR="/tmp/.minetest" + mkdir -p \ + "${DATA_DIR}/games" \ + "${DATA_DIR}/mods" \ + "${DATA_DIR}/main-config" +fi + +if [[ ! -f "${DATA_DIR}/main-config/minetest.conf" ]]; then + cp /defaults/minetest.conf "${DATA_DIR}/main-config/minetest.conf" +fi + +if [[ ! -d "${DATA_DIR}/games/minimal" ]]; then + cp -pr /defaults/games/* "${DATA_DIR}/games/" +fi + +if [[ "${DATA_DIR}" == "/tmp/.minetest" ]]; then + export HOME="/tmp" +fi +export MINETEST_GAME_PATH="${DATA_DIR}/games" + +exec luantiserver --port 30000 \ + --config "${DATA_DIR}/main-config/minetest.conf" ${CLI_ARGS} diff --git a/porting/queues/failing/minetest/Dockerfile b/porting/queues/passing/minetest/Dockerfile similarity index 60% rename from porting/queues/failing/minetest/Dockerfile rename to porting/queues/passing/minetest/Dockerfile index dc55f9126..6865071c2 100644 --- a/porting/queues/failing/minetest/Dockerfile +++ b/porting/queues/passing/minetest/Dockerfile @@ -11,7 +11,7 @@ ENV HOME="/config" \ MINETEST_GAME_PATH="/config/.minetest/games" # build variables -ARG LDFLAGS="-lintl" +ARG LDFLAGS="" RUN \ echo "**** install build packages ****" && \ @@ -25,6 +25,7 @@ RUN \ libgmp-dev \ libhiredis-dev \ libicu-dev \ + libirrlicht-dev \ libleveldb-dev \ libjpeg-dev \ libogg-dev \ @@ -56,46 +57,6 @@ RUN \ sqlite3 \ zstd \ libzstd1 && \ - echo "**** compile prometheus-cpp ****" && \ - mkdir -p /tmp/prometheus-cpp && \ - PROM_URL=$(curl -sX GET "https://api.github.com/repos/jupp0r/prometheus-cpp/releases/latest" \ - | jq -r .assets[].browser_download_url) && \ - curl -o /tmp/prometheus-cpp.tar.gz \ - -L "$PROM_URL" && \ - tar xf /tmp/prometheus-cpp.tar.gz -C \ - /tmp/prometheus-cpp --strip-components=1 && \ - cd /tmp/prometheus-cpp && \ - mkdir build && \ - cd build && \ - cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DENABLE_TESTING=0 && \ - make -j 4 && \ - make install && \ - echo "**** compile spatialindex ****" && \ - mkdir -p /tmp/spatialindex && \ - SPATIAL_VER=$(curl -sX GET "https://api.github.com/repos/libspatialindex/libspatialindex/commits/main" \ - | jq -r .sha) && \ - curl -o /tmp/spatialindex.tar.gz \ - -L "https://github.com/libspatialindex/libspatialindex/archive/${SPATIAL_VER}.tar.gz" && \ - tar xf /tmp/spatialindex.tar.gz -C \ - /tmp/spatialindex --strip-components=1 && \ - cd /tmp/spatialindex && \ - cmake . \ - -DCMAKE_INSTALL_PREFIX=/usr && \ - make -j 4 && \ - make install && \ - echo "**** compile irrlicht ****" && \ - mkdir -p /tmp/irrlicht && \ - IRRLICHT_VER=$(curl -sX GET "https://api.github.com/repos/minetest/irrlicht/releases/latest" \ - | jq -r .tag_name) && \ - curl -o /tmp/irrlicht.tar.gz \ - -L "https://github.com/minetest/irrlicht/archive/${IRRLICHT_VER}.tar.gz" && \ - tar xf /tmp/irrlicht.tar.gz -C \ - /tmp/irrlicht --strip-components=1 && \ - cd /tmp/irrlicht && \ - cmake . && \ - make -j 4 && \ - make install && \ echo "**** compile minetestserver ****" && \ mkdir -p \ /tmp/minetest && \ @@ -105,6 +66,7 @@ RUN \ tar xf \ /tmp/minetest-src.tar.gz -C \ /tmp/minetest --strip-components=1 && \ + mkdir -p /defaults && \ sed -i 's/# enable_ipv6 = true/enable_ipv6 = true/' /tmp/minetest/minetest.conf.example && \ sed -i 's/# ipv6_server = false/ipv6_server = true/' /tmp/minetest/minetest.conf.example && \ cp /tmp/minetest/minetest.conf.example /defaults/minetest.conf && \ @@ -122,8 +84,8 @@ RUN \ -DENABLE_LEVELDB=1 \ -DENABLE_LUAJIT=1 \ -DENABLE_POSTGRESQL=1 \ - -DENABLE_PROMETHEUS=1 \ - -DENABLE_REDIS=1 \ + -DENABLE_PROMETHEUS=0 \ + -DENABLE_REDIS=0 \ -DENABLE_SOUND=0 \ -DENABLE_SYSTEM_GMP=1 \ -DRUN_IN_PLACE=0 && \ diff --git a/porting/queues/failing/minetest/NOT_WORKING_YET.md b/porting/queues/passing/minetest/NOT_WORKING_YET.md similarity index 100% rename from porting/queues/failing/minetest/NOT_WORKING_YET.md rename to porting/queues/passing/minetest/NOT_WORKING_YET.md diff --git a/porting/queues/failing/minetest/amd64-build.log b/porting/queues/passing/minetest/amd64-build.log similarity index 100% rename from porting/queues/failing/minetest/amd64-build.log rename to porting/queues/passing/minetest/amd64-build.log diff --git a/porting/queues/failing/minetest/docker-bake.hcl b/porting/queues/passing/minetest/docker-bake.hcl similarity index 100% rename from porting/queues/failing/minetest/docker-bake.hcl rename to porting/queues/passing/minetest/docker-bake.hcl diff --git a/porting/queues/passing/minetest/start.sh b/porting/queues/passing/minetest/start.sh new file mode 100755 index 000000000..ec335ff37 --- /dev/null +++ b/porting/queues/passing/minetest/start.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env bash + + +DATA_DIR="/config/.minetest" +if [[ ! -w /config ]] || ! mkdir -p \ + "${DATA_DIR}/games" \ + "${DATA_DIR}/mods" \ + "${DATA_DIR}/main-config"; then + DATA_DIR="/tmp/.minetest" + mkdir -p \ + "${DATA_DIR}/games" \ + "${DATA_DIR}/mods" \ + "${DATA_DIR}/main-config" +fi + +if [[ ! -f "${DATA_DIR}/main-config/minetest.conf" ]]; then + cp /defaults/minetest.conf "${DATA_DIR}/main-config/minetest.conf" +fi + +if [[ ! -d "${DATA_DIR}/games/minimal" ]]; then + cp -pr /defaults/games/* "${DATA_DIR}/games/" +fi + +if [[ "${DATA_DIR}" == "/tmp/.minetest" ]]; then + export HOME="/tmp" +fi +export MINETEST_GAME_PATH="${DATA_DIR}/games" + +exec luantiserver --port 30000 \ + --gameid "${GAME_ID:-devtest}" \ + --config "${DATA_DIR}/main-config/minetest.conf" ${CLI_ARGS} diff --git a/porting/queues/failing/phpmyadmin/Dockerfile b/porting/queues/passing/phpmyadmin/Dockerfile similarity index 100% rename from porting/queues/failing/phpmyadmin/Dockerfile rename to porting/queues/passing/phpmyadmin/Dockerfile diff --git a/porting/queues/failing/phpmyadmin/NOT_WORKING_YET.md b/porting/queues/passing/phpmyadmin/NOT_WORKING_YET.md similarity index 100% rename from porting/queues/failing/phpmyadmin/NOT_WORKING_YET.md rename to porting/queues/passing/phpmyadmin/NOT_WORKING_YET.md diff --git a/porting/queues/failing/phpmyadmin/amd64-build.log b/porting/queues/passing/phpmyadmin/amd64-build.log similarity index 100% rename from porting/queues/failing/phpmyadmin/amd64-build.log rename to porting/queues/passing/phpmyadmin/amd64-build.log diff --git a/porting/queues/failing/phpmyadmin/docker-bake.hcl b/porting/queues/passing/phpmyadmin/docker-bake.hcl similarity index 100% rename from porting/queues/failing/phpmyadmin/docker-bake.hcl rename to porting/queues/passing/phpmyadmin/docker-bake.hcl diff --git a/porting/queues/failing/phpmyadmin/root/app/phpmyadmin/index.html b/porting/queues/passing/phpmyadmin/root/app/phpmyadmin/index.html similarity index 100% rename from porting/queues/failing/phpmyadmin/root/app/phpmyadmin/index.html rename to porting/queues/passing/phpmyadmin/root/app/phpmyadmin/index.html diff --git a/porting/queues/failing/phpmyadmin/root/defaults/config.inc.php b/porting/queues/passing/phpmyadmin/root/defaults/config.inc.php similarity index 100% rename from porting/queues/failing/phpmyadmin/root/defaults/config.inc.php rename to porting/queues/passing/phpmyadmin/root/defaults/config.inc.php diff --git a/porting/queues/failing/phpmyadmin/root/defaults/helpers.php b/porting/queues/passing/phpmyadmin/root/defaults/helpers.php similarity index 100% rename from porting/queues/failing/phpmyadmin/root/defaults/helpers.php rename to porting/queues/passing/phpmyadmin/root/defaults/helpers.php diff --git a/porting/queues/failing/phpmyadmin/root/defaults/nginx/site-confs/default.conf.sample b/porting/queues/passing/phpmyadmin/root/defaults/nginx/site-confs/default.conf.sample similarity index 100% rename from porting/queues/failing/phpmyadmin/root/defaults/nginx/site-confs/default.conf.sample rename to porting/queues/passing/phpmyadmin/root/defaults/nginx/site-confs/default.conf.sample diff --git a/porting/queues/failing/phpmyadmin/start.sh b/porting/queues/passing/phpmyadmin/start.sh similarity index 85% rename from porting/queues/failing/phpmyadmin/start.sh rename to porting/queues/passing/phpmyadmin/start.sh index 9f5551f06..4a9820273 100755 --- a/porting/queues/failing/phpmyadmin/start.sh +++ b/porting/queues/passing/phpmyadmin/start.sh @@ -24,14 +24,15 @@ if [[ ! -f /config/phpmyadmin/config.user.inc.php ]]; then fi if [[ ! -f /config/phpmyadmin/config.inc.php ]]; then - cp /defaults/config.inc.php /config/phpmyadmin/config.inc.php + cp /root/defaults/config.inc.php /config/phpmyadmin/config.inc.php fi if [[ ! -f /config/phpmyadmin/helpers.php ]]; then - cp /defaults/helpers.php /config/phpmyadmin/helpers.php + cp /root/defaults/helpers.php /config/phpmyadmin/helpers.php fi +if [[ -w "/app/www/public" ]]; then # Set up themes if [[ -d "/config/themes" && ! -L "/app/www/public/themes" ]]; then cp -R /app/www/public/themes/* /config/themes @@ -43,5 +44,7 @@ fi if [[ -d "/config/themes" && ! -L "/app/www/public/themes" ]]; then ln -s "/config/themes" "/app/www/public/themes" fi +fi -## TODO: find exec +cd /app/www/public +exec php -S 0.0.0.0:8080 diff --git a/porting/queues/failing/piwigo/Dockerfile b/porting/queues/passing/piwigo/Dockerfile similarity index 100% rename from porting/queues/failing/piwigo/Dockerfile rename to porting/queues/passing/piwigo/Dockerfile diff --git a/porting/queues/failing/piwigo/NOT_WORKING_YET.md b/porting/queues/passing/piwigo/NOT_WORKING_YET.md similarity index 100% rename from porting/queues/failing/piwigo/NOT_WORKING_YET.md rename to porting/queues/passing/piwigo/NOT_WORKING_YET.md diff --git a/porting/queues/failing/piwigo/amd64-build.log b/porting/queues/passing/piwigo/amd64-build.log similarity index 100% rename from porting/queues/failing/piwigo/amd64-build.log rename to porting/queues/passing/piwigo/amd64-build.log diff --git a/porting/queues/failing/piwigo/docker-bake.hcl b/porting/queues/passing/piwigo/docker-bake.hcl similarity index 100% rename from porting/queues/failing/piwigo/docker-bake.hcl rename to porting/queues/passing/piwigo/docker-bake.hcl diff --git a/porting/queues/failing/piwigo/root/etc/php83/conf.d/piwigo.ini b/porting/queues/passing/piwigo/root/etc/php83/conf.d/piwigo.ini similarity index 100% rename from porting/queues/failing/piwigo/root/etc/php83/conf.d/piwigo.ini rename to porting/queues/passing/piwigo/root/etc/php83/conf.d/piwigo.ini diff --git a/porting/queues/passing/piwigo/start.sh b/porting/queues/passing/piwigo/start.sh new file mode 100755 index 000000000..044fd84f8 --- /dev/null +++ b/porting/queues/passing/piwigo/start.sh @@ -0,0 +1,80 @@ +#!/usr/bin/env bash + + +# make our folders +mkdir -p \ + /config/www \ + /config/www/local/config \ + /config/gallery/upload \ + /config/gallery/galleries + +if [[ -w /app/www/public ]]; then + # Migrate old data + if [[ -f /gallery/index.php ]]; then + echo "*******************************************************************************" + echo "" + echo "Migrating old install..." + mv /gallery/_data/ /config/www/_data + mv /gallery/language/ /config/www/language + mv /gallery/plugins/ /config/www/plugins + mv /gallery/themes/ /config/www/themes + mv /gallery/local/ /config/www/local + mv /gallery/template-extension/ /config/www/template-extension + rm /gallery/index.php + rm /config/www/gallery + sed -i "s|root /config/www/gallery;|root /app/www/public;|" /config/nginx/site-confs/default.conf + echo "Migration completed." + echo "" + echo "You can now safely delete everything in /gallery *except* for the upload and" + echo "galleries directories. If your photos are stored elsewhere you can ignore this." + echo "" + echo "*******************************************************************************" + fi + + shopt -s globstar dotglob + + symlinks=( + /app/www/public/upload + /app/www/public/galleries + ) + + for i in "${symlinks[@]}"; do + if [[ -d /gallery/"$(basename "$i")" && ! -L "$i" ]]; then + rm -rf "$i" + fi + if [[ -d /gallery/"$(basename "$i")" && ! -L "$i" ]]; then + ln -s /gallery/"$(basename "$i")" "$i" + fi + done + + symlinks=( + /app/www/public/language + /app/www/public/plugins + /app/www/public/local + /app/www/public/themes + /app/www/public/_data + /app/www/public/template-extension + ) + + for i in "${symlinks[@]}"; do + if [[ -d /config/www/"$(basename "$i")" && ! -L "$i" ]]; then + rm -rf "$i" + fi + if [[ ! -d /config/www/"$(basename "$i")" && ! -L "$i" ]]; then + mv "$i" /config/www/ + fi + if [[ -d /config/www/"$(basename "$i")" && ! -L "$i" ]]; then + ln -s /config/www/"$(basename "$i")" "$i" + fi + done + + shopt -u globstar dotglob +fi + +# copy config +if [[ ! -f "/config/www/local/config/config.inc.php" ]]; then + cp /app/www/public/include/config_default.inc.php /config/www/local/config/config.inc.php +fi + +cd /app/www/public +exec php -S 0.0.0.0:8080 diff --git a/porting/queues/failing/pydio-cells/Dockerfile b/porting/queues/passing/pydio-cells/Dockerfile similarity index 84% rename from porting/queues/failing/pydio-cells/Dockerfile rename to porting/queues/passing/pydio-cells/Dockerfile index 26754778c..4bfed4db2 100644 --- a/porting/queues/failing/pydio-cells/Dockerfile +++ b/porting/queues/passing/pydio-cells/Dockerfile @@ -1,6 +1,10 @@ FROM ghcr.io/trueforge-org/golang:1.26.0 as buildstage USER root +ARG VERSION +ARG TARGETARCH +ARG BUILD_DATE + ENV \ HOME="/config" \ @@ -20,7 +24,9 @@ RUN \ /tmp/cells-src.tar.gz \ https://github.com/pydio/cells/archive/v${VERSION}.tar.gz || curl -fL -o \ /tmp/cells-src.tar.gz \ - https://github.com/pydio/cells/archive/${VERSION}.tar.gz) && \ + https://github.com/pydio/cells/archive/${VERSION}.tar.gz || curl -fL -o \ + /tmp/cells-src.tar.gz \ + https://github.com/pydio/cells/archive/refs/tags/v${VERSION}.tar.gz) && \ tar xf \ /tmp/cells-src.tar.gz -C \ /tmp/src/github.com/pydio/cells --strip-components=1 && \ @@ -28,7 +34,7 @@ RUN \ cd /tmp/src/github.com/pydio/cells && \ GOARCH=$TARGETARCH GOOS=linux go build -trimpath \ -ldflags "\ - -X github.com/pydio/cells/v4/common.version=${VERSION:1} \ + -X github.com/pydio/cells/v4/common.version=${VERSION} \ -X github.com/pydio/cells/v4/common.BuildStamp=${BUILD_DATE} \ -X github.com/pydio/cells/v4/common.BuildRevision=v${VERSION}" \ -o /app/cells -x . && \ diff --git a/porting/queues/failing/pydio-cells/NOT_WORKING_YET.md b/porting/queues/passing/pydio-cells/NOT_WORKING_YET.md similarity index 100% rename from porting/queues/failing/pydio-cells/NOT_WORKING_YET.md rename to porting/queues/passing/pydio-cells/NOT_WORKING_YET.md diff --git a/porting/queues/failing/pydio-cells/amd64-build.log b/porting/queues/passing/pydio-cells/amd64-build.log similarity index 100% rename from porting/queues/failing/pydio-cells/amd64-build.log rename to porting/queues/passing/pydio-cells/amd64-build.log diff --git a/porting/queues/failing/pydio-cells/docker-bake.hcl b/porting/queues/passing/pydio-cells/docker-bake.hcl similarity index 100% rename from porting/queues/failing/pydio-cells/docker-bake.hcl rename to porting/queues/passing/pydio-cells/docker-bake.hcl diff --git a/porting/queues/failing/pydio-cells/start.sh b/porting/queues/passing/pydio-cells/start.sh similarity index 75% rename from porting/queues/failing/pydio-cells/start.sh rename to porting/queues/passing/pydio-cells/start.sh index 70b2c9b24..cb45ba1e2 100755 --- a/porting/queues/failing/pydio-cells/start.sh +++ b/porting/queues/passing/pydio-cells/start.sh @@ -11,7 +11,7 @@ if [[ -f "/config/keys/cert.crt" ]] && openssl x509 -in /config/keys/cert.crt -n else echo "generating self signed cert with SAN $SERVER_IP" openssl req -new -x509 -days 3650 -nodes -out /config/keys/cert.crt -keyout /config/keys/cert.key -extensions 'v3_req' \ - -config <(printf "[req]\nprompt=no\ndistinguished_name=all_the_dn_details\nreq_extensions=v3_req\n[all_the_dn_details]\nC=US\nST=CA\nL=Carlsbad\nO=Linuxserver.io\nOU=LSIO Server\nCN=*\n[v3_req]\nsubjectAltName=DNS:pydio-cells,IP:${SERVER_IP}") + -config <(printf '%s' "[req]\nprompt=no\ndistinguished_name=all_the_dn_details\nreq_extensions=v3_req\n[all_the_dn_details]\nC=US\nST=CA\nL=Carlsbad\nO=Linuxserver.io\nOU=LSIO Server\nCN=*\n[v3_req]\nsubjectAltName=DNS:pydio-cells,IP:${SERVER_IP}") fi if [[ -f /config/pydio.json ]]; then @@ -23,22 +23,10 @@ if [[ -f /config/pydio.json ]]; then fi fi -# permissions - - /app \ - /config - - - - - if [[ -f /config/pydio.json ]]; then RUN_OPTS="start --log=production" else RUN_OPTS="configure --site_bind 0.0.0.0:8080 --site_external $EXTERNALURL --tls_cert_file /config/keys/cert.crt --tls_key_file /config/keys/cert.key" fi -exec \ - - /app/cells ${RUN_OPTS} - +exec /app/cells ${RUN_OPTS} diff --git a/porting/queues/failing/ubooquity/Dockerfile b/porting/queues/passing/ubooquity/Dockerfile similarity index 100% rename from porting/queues/failing/ubooquity/Dockerfile rename to porting/queues/passing/ubooquity/Dockerfile diff --git a/porting/queues/failing/ubooquity/NOT_WORKING_YET.md b/porting/queues/passing/ubooquity/NOT_WORKING_YET.md similarity index 100% rename from porting/queues/failing/ubooquity/NOT_WORKING_YET.md rename to porting/queues/passing/ubooquity/NOT_WORKING_YET.md diff --git a/porting/queues/failing/ubooquity/amd64-build.log b/porting/queues/passing/ubooquity/amd64-build.log similarity index 100% rename from porting/queues/failing/ubooquity/amd64-build.log rename to porting/queues/passing/ubooquity/amd64-build.log diff --git a/porting/queues/failing/ubooquity/docker-bake.hcl b/porting/queues/passing/ubooquity/docker-bake.hcl similarity index 100% rename from porting/queues/failing/ubooquity/docker-bake.hcl rename to porting/queues/passing/ubooquity/docker-bake.hcl diff --git a/porting/queues/failing/ubooquity/root/defaults/preferences.json b/porting/queues/passing/ubooquity/root/defaults/preferences.json similarity index 100% rename from porting/queues/failing/ubooquity/root/defaults/preferences.json rename to porting/queues/passing/ubooquity/root/defaults/preferences.json diff --git a/porting/queues/failing/ubooquity/start.sh b/porting/queues/passing/ubooquity/start.sh similarity index 100% rename from porting/queues/failing/ubooquity/start.sh rename to porting/queues/passing/ubooquity/start.sh diff --git a/porting/queues/failing/unrar/Dockerfile b/porting/queues/passing/unrar/Dockerfile similarity index 100% rename from porting/queues/failing/unrar/Dockerfile rename to porting/queues/passing/unrar/Dockerfile diff --git a/porting/queues/failing/unrar/NOT_WORKING_YET.md b/porting/queues/passing/unrar/NOT_WORKING_YET.md similarity index 100% rename from porting/queues/failing/unrar/NOT_WORKING_YET.md rename to porting/queues/passing/unrar/NOT_WORKING_YET.md diff --git a/porting/queues/failing/unrar/amd64-build.log b/porting/queues/passing/unrar/amd64-build.log similarity index 100% rename from porting/queues/failing/unrar/amd64-build.log rename to porting/queues/passing/unrar/amd64-build.log diff --git a/porting/queues/failing/unrar/docker-bake.hcl b/porting/queues/passing/unrar/docker-bake.hcl similarity index 100% rename from porting/queues/failing/unrar/docker-bake.hcl rename to porting/queues/passing/unrar/docker-bake.hcl diff --git a/porting/queues/failing/unrar/start.sh b/porting/queues/passing/unrar/start.sh similarity index 100% rename from porting/queues/failing/unrar/start.sh rename to porting/queues/passing/unrar/start.sh diff --git a/porting/queues/failing/webgrabplus/Dockerfile b/porting/queues/passing/webgrabplus/Dockerfile similarity index 100% rename from porting/queues/failing/webgrabplus/Dockerfile rename to porting/queues/passing/webgrabplus/Dockerfile diff --git a/porting/queues/failing/webgrabplus/NOT_WORKING_YET.md b/porting/queues/passing/webgrabplus/NOT_WORKING_YET.md similarity index 100% rename from porting/queues/failing/webgrabplus/NOT_WORKING_YET.md rename to porting/queues/passing/webgrabplus/NOT_WORKING_YET.md diff --git a/porting/queues/failing/webgrabplus/amd64-build.log b/porting/queues/passing/webgrabplus/amd64-build.log similarity index 100% rename from porting/queues/failing/webgrabplus/amd64-build.log rename to porting/queues/passing/webgrabplus/amd64-build.log diff --git a/porting/queues/failing/webgrabplus/docker-bake.hcl b/porting/queues/passing/webgrabplus/docker-bake.hcl similarity index 100% rename from porting/queues/failing/webgrabplus/docker-bake.hcl rename to porting/queues/passing/webgrabplus/docker-bake.hcl diff --git a/porting/queues/failing/webgrabplus/root/app/update.sh b/porting/queues/passing/webgrabplus/root/app/update.sh similarity index 100% rename from porting/queues/failing/webgrabplus/root/app/update.sh rename to porting/queues/passing/webgrabplus/root/app/update.sh diff --git a/porting/queues/failing/webgrabplus/root/defaults/WebGrab++.config.xml b/porting/queues/passing/webgrabplus/root/defaults/WebGrab++.config.xml similarity index 100% rename from porting/queues/failing/webgrabplus/root/defaults/WebGrab++.config.xml rename to porting/queues/passing/webgrabplus/root/defaults/WebGrab++.config.xml diff --git a/porting/queues/failing/webgrabplus/root/etc/crontabs/abc b/porting/queues/passing/webgrabplus/root/etc/crontabs/abc similarity index 100% rename from porting/queues/failing/webgrabplus/root/etc/crontabs/abc rename to porting/queues/passing/webgrabplus/root/etc/crontabs/abc diff --git a/porting/queues/failing/webgrabplus/start.sh b/porting/queues/passing/webgrabplus/start.sh similarity index 56% rename from porting/queues/failing/webgrabplus/start.sh rename to porting/queues/passing/webgrabplus/start.sh index 9f559c727..72d744a25 100755 --- a/porting/queues/failing/webgrabplus/start.sh +++ b/porting/queues/passing/webgrabplus/start.sh @@ -2,17 +2,15 @@ mkdir -p \ - /app/wg++/bin.net/WebGrab+Plus \ /config/License -ln -sf /config/License /app/wg++/bin.net/WebGrab+Plus # copy config if [[ ! -e /config/WebGrab++.config.xml ]]; then - cp /defaults/WebGrab++.config.xml /config/ + cp /root/defaults/WebGrab++.config.xml /config/ fi if [[ ! -e /config/siteini.pack ]]; then cp -R /defaults/ini/siteini.pack /config/ fi -## TODO: figure out exec +exec /app/dotnet/dotnet /app/wg++/bin.net/WebGrab+Plus.dll /config