diff --git a/Dockerfile b/Dockerfile index 4d39cb2..5fbbb6b 100755 --- a/Dockerfile +++ b/Dockerfile @@ -24,11 +24,3 @@ RUN ls -lha /usr/share/lxqt/themes/light/simple_blue_widescreen.png RUN bash installs/gnomedownloader.bash RUN bash installs/sshserver.bash - -RUN bash installs/cron.bash - -## - -COPY provision/startup/startup.sh /startup.sh - -## diff --git a/compose.template b/compose.template deleted file mode 100644 index 08d743e..0000000 --- a/compose.template +++ /dev/null @@ -1,68 +0,0 @@ - -services: - -########################################## -## -## orchestration / yankee-desktop-remix -## -##########################################x - - yankee-desktop-remix-XXX: - - container_name: yankee-desktop-remix-XXX - - image: softwareshinobi/yankee-desktop-remix - - restart: unless-stopped - - build: - - context: . - - dockerfile: Dockerfile - - volumes: - - - yankee-nfs-downloads:/root/Downloads - - hostname: yankee-desktop-XXX - - ports: - - - "2XXX2:22" - - - "2XXX8:80" - - - "2XXX9:5900" - - environment: - - TZ: America/Bogota - - USER_UID: 1000 - - USER_GID: 1000 - - USER: root - - PASSWORD: yankee - - HTTP_PASSWORD: yankee - -########################################## -## -## volumes / yankee-desktop-remix -## -##########################################x - -volumes: - - yankee-nfs-downloads: - - driver_opts: - - type: "nfs" - - o: nfsvers=4,addr=osiris.yankee.embanet.online,nolock,hard,rw - - device: ":/" diff --git a/compose.yaml b/compose.yaml index d1fa37b..28c97d0 100644 --- a/compose.yaml +++ b/compose.yaml @@ -7,9 +7,9 @@ services: ## ##########################################x - yankee-desktop-remix-000: + yankee-downloader-desktop-manual: - container_name: yankee-desktop-remix-000 + container_name: yankee-downloader-desktop-manual image: softwareshinobi/yankee-downloader-desktop:manual @@ -23,27 +23,27 @@ services: volumes: - - yankee-nfs-downloads:/root/Downloads + - yankee-downloader-nfs-downloads:/root/Downloads - hostname: yankee-desktop-000 + hostname: yankeedesktop ports: - - "20002:22" + - "23022:22" - - "20008:80" + - "23080:80" - - "20009:5900" + - "23900:5900" environment: - TZ: America/Bogota + TZ: America/New_York USER_UID: 1000 USER_GID: 1000 - USER: root + USER: yankee PASSWORD: yankee @@ -57,7 +57,7 @@ services: volumes: - yankee-nfs-downloads: + yankee-downloader-nfs-downloads: driver_opts: diff --git a/compose1x.bash b/compose1x.bash deleted file mode 100755 index 0d2cd27..0000000 --- a/compose1x.bash +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/bash - -## - -set -e - -set -x - -## - -reset - -clear - -## - - -## - -processorCount=`grep -c '^processor' /proc/cpuinfo` - -processorCount=1 - -echo "num cpus / "$processorCount - -for i in $(seq 2 "$processorCount"); do - - echo "Processing unit: $i" - -## - -rm -f compose.yaml - -echo "services:" >> compose.yaml - -## - -for x in $(seq 1 "$processorCount"); do - - i=$(printf "%03d" "$x") - - # Create the service definition - service_def=$(cat <> compose.yaml - -done - - -# Add the volumes section ONCE after the loop (outside) -cat <> compose.yaml - -########################################## -## -## volumes / yankee-desktop-remix -## -########################################## - -volumes: - yankee-nfs-downloads: - driver_opts: - type: "nfs" - o: nfsvers=4,addr=osiris.yankee.embanet.online,nolock,hard,rw - device: ":/" - -EOF - #... your commands to process each unit... - -done -## - -docker compose down --remove-orphans - -docker compose up -d - -docker stats diff --git a/dev.bash b/dev.bash deleted file mode 100755 index 4a5f42f..0000000 --- a/dev.bash +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -## - -set -e - -set -x - -## - -reset - -clear - -## - -## docker compose pull - -docker compose down --remove-orphans - -echo "pruning..." - -docker container prune -f - - -rm -f *.devvv - -touch touch $(cat /proc/sys/kernel/random/uuid)".devvv" - -ls -lha - -sleep 5 - -docker compose up --build diff --git a/provision/installs/cron.bash b/provision/installs/cron.bash deleted file mode 100755 index 474868c..0000000 --- a/provision/installs/cron.bash +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -apt install -y cron; diff --git a/provision/installs/download-code.bash b/provision/installs/download-code.bash new file mode 100644 index 0000000..00d4bfe --- /dev/null +++ b/provision/installs/download-code.bash @@ -0,0 +1,21 @@ +#!/bin/bash + +echo "##" +echo "## launch > yankee > download consumer code" +echo "##" + +cd / + +rm -rf /yankee-gnome-fire-consumer + +git https://code.softwareshinobi.com/yankee/yankee-gnome-fire-consumer.git + +chmod 777 yankee-gnome-fire-consumer -R + +mv yankee-gnome-fire-consumer yankee-consumer + +chmod +x *.bash + +chmod +x *.sh + +ls -lha diff --git a/provision/media/Backgrounds/desktop.png b/provision/media/Backgrounds/desktop.png index 46ab9a8..af89747 100644 Binary files a/provision/media/Backgrounds/desktop.png and b/provision/media/Backgrounds/desktop.png differ