Compare commits
12 Commits
bd63a3d1fd
...
manual
| Author | SHA1 | Date | |
|---|---|---|---|
| 1bf6aa0fdf | |||
|
|
355c8af067 | ||
|
|
9556f01d6f | ||
|
|
6f88b7a08e | ||
|
|
11a73c5692 | ||
|
|
7d1cbbcafb | ||
|
|
f6e8f90d66 | ||
|
|
c406f2afe5 | ||
|
|
b828a6e572 | ||
|
|
6abcec74f8 | ||
|
|
7559c77cae | ||
|
|
ab9b3d9904 |
73
.scalingTrash/compose (copy 1).yaml
Normal file
73
.scalingTrash/compose (copy 1).yaml
Normal file
@@ -0,0 +1,73 @@
|
||||
services:
|
||||
|
||||
|
||||
##########################################
|
||||
##
|
||||
## orchestration / yankee-desktop-remix
|
||||
##
|
||||
##########################################001
|
||||
|
||||
yankee-desktop-remix-001:
|
||||
container_name: yankee-desktop-remix-001
|
||||
image: softwareshinobi/yankee-desktop-remix
|
||||
restart: unless-stopped
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile
|
||||
volumes:
|
||||
- yankee-nfs-downloads:/root/Downloads
|
||||
hostname: yankee-desktop-001
|
||||
ports:
|
||||
- "20012:22"
|
||||
- "20018:80"
|
||||
- "20019:5900"
|
||||
environment:
|
||||
TZ: America/Bogota
|
||||
USER_UID: 1000
|
||||
USER_GID: 1000
|
||||
USER: root
|
||||
PASSWORD: yankee
|
||||
HTTP_PASSWORD: yankee
|
||||
|
||||
|
||||
##########################################
|
||||
##
|
||||
## orchestration / yankee-desktop-remix
|
||||
##
|
||||
##########################################002
|
||||
|
||||
yankee-desktop-remix-002:
|
||||
container_name: yankee-desktop-remix-002
|
||||
image: softwareshinobi/yankee-desktop-remix
|
||||
restart: unless-stopped
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile
|
||||
volumes:
|
||||
- yankee-nfs-downloads:/root/Downloads
|
||||
hostname: yankee-desktop-002
|
||||
ports:
|
||||
- "20022:22"
|
||||
- "20028:80"
|
||||
- "20029:5900"
|
||||
environment:
|
||||
TZ: America/Bogota
|
||||
USER_UID: 1000
|
||||
USER_GID: 1000
|
||||
USER: root
|
||||
PASSWORD: yankee
|
||||
HTTP_PASSWORD: yankee
|
||||
|
||||
##########################################
|
||||
##
|
||||
## volumes / yankee-desktop-remix
|
||||
##
|
||||
##########################################
|
||||
|
||||
volumes:
|
||||
yankee-nfs-downloads:
|
||||
driver_opts:
|
||||
type: "nfs"
|
||||
o: nfsvers=4,addr=osiris.yankee.embanet.online,nolock,hard,rw
|
||||
device: ":/"
|
||||
|
||||
@@ -25,10 +25,5 @@ RUN bash installs/gnomedownloader.bash
|
||||
|
||||
RUN bash installs/sshserver.bash
|
||||
|
||||
RUN bash installs/cron.bash
|
||||
RUN bash installs/download-code.bash
|
||||
|
||||
##
|
||||
|
||||
COPY provision/startup/startup.sh /startup.sh
|
||||
|
||||
##
|
||||
|
||||
54
Jenkinsfile
vendored
Executable file
54
Jenkinsfile
vendored
Executable file
@@ -0,0 +1,54 @@
|
||||
pipeline {
|
||||
|
||||
agent none
|
||||
|
||||
options {
|
||||
|
||||
disableConcurrentBuilds(abortPrevious: true)
|
||||
|
||||
buildDiscarder(logRotator(numToKeepStr: '10'))
|
||||
}
|
||||
|
||||
stages {
|
||||
|
||||
stage('docker compose build') {
|
||||
|
||||
agent {
|
||||
|
||||
label "huracan"
|
||||
|
||||
}
|
||||
|
||||
steps {
|
||||
|
||||
dir('.') {
|
||||
|
||||
sh 'docker compose build'
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
stage('docker compose push') {
|
||||
|
||||
agent {
|
||||
|
||||
label "huracan"
|
||||
|
||||
}
|
||||
|
||||
steps {
|
||||
|
||||
dir('.') {
|
||||
|
||||
sh 'docker compose push'
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}}
|
||||
94
compose.bash
94
compose.bash
@@ -2,108 +2,18 @@
|
||||
|
||||
##
|
||||
|
||||
set -e
|
||||
|
||||
set -x
|
||||
|
||||
##
|
||||
|
||||
reset
|
||||
|
||||
clear
|
||||
|
||||
##
|
||||
|
||||
set -e
|
||||
|
||||
##
|
||||
set -x
|
||||
|
||||
processorCount=`grep -c '^processor' /proc/cpuinfo`
|
||||
|
||||
processorCount=$((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 <<EOF
|
||||
|
||||
|
||||
##########################################
|
||||
##
|
||||
## orchestration / yankee-desktop-remix
|
||||
##
|
||||
##########################################$i
|
||||
|
||||
yankee-desktop-remix-$i:
|
||||
container_name: yankee-desktop-remix-$i
|
||||
image: softwareshinobi/yankee-desktop-remix
|
||||
restart: unless-stopped
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile
|
||||
volumes:
|
||||
- yankee-nfs-downloads:/root/Downloads
|
||||
hostname: yankee-desktop-$i
|
||||
ports:
|
||||
- "2${i}2:22"
|
||||
- "2${i}8:80"
|
||||
- "2${i}9:5900"
|
||||
environment:
|
||||
TZ: America/Bogota
|
||||
USER_UID: 1000
|
||||
USER_GID: 1000
|
||||
USER: root
|
||||
PASSWORD: yankee
|
||||
HTTP_PASSWORD: yankee
|
||||
|
||||
EOF
|
||||
)
|
||||
|
||||
# Append the service definition to compose.yaml
|
||||
echo "$service_def" >> compose.yaml
|
||||
|
||||
done
|
||||
|
||||
|
||||
# Add the volumes section ONCE after the loop (outside)
|
||||
cat <<EOF >> 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
|
||||
|
||||
@@ -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: ":/"
|
||||
89
compose.yaml
89
compose.yaml
@@ -1,73 +1,68 @@
|
||||
|
||||
services:
|
||||
|
||||
|
||||
##########################################
|
||||
##
|
||||
## orchestration / yankee-desktop-remix
|
||||
##
|
||||
##########################################001
|
||||
##########################################x
|
||||
|
||||
yankee-downloader-desktop-manual:
|
||||
|
||||
container_name: yankee-downloader-desktop-manual
|
||||
|
||||
image: softwareshinobi/yankee-downloader-desktop:manual
|
||||
|
||||
yankee-desktop-remix-001:
|
||||
container_name: yankee-desktop-remix-001
|
||||
image: softwareshinobi/yankee-desktop-remix
|
||||
restart: unless-stopped
|
||||
build:
|
||||
|
||||
build:
|
||||
|
||||
context: .
|
||||
|
||||
dockerfile: Dockerfile
|
||||
|
||||
volumes:
|
||||
- yankee-nfs-downloads:/root/Downloads
|
||||
hostname: yankee-desktop-001
|
||||
|
||||
- yankee-downloader-nfs-downloads:/home/yankee/Downloads
|
||||
|
||||
hostname: yankeedesktop
|
||||
|
||||
ports:
|
||||
- "20012:22"
|
||||
- "20018:80"
|
||||
- "20019:5900"
|
||||
|
||||
- "23022:22"
|
||||
|
||||
- "23080:80"
|
||||
|
||||
- "23900:5900"
|
||||
|
||||
environment:
|
||||
TZ: America/Bogota
|
||||
|
||||
TZ: America/New_York
|
||||
|
||||
USER_UID: 1000
|
||||
|
||||
USER_GID: 1000
|
||||
USER: root
|
||||
|
||||
USER: yankee
|
||||
|
||||
PASSWORD: yankee
|
||||
HTTP_PASSWORD: yankee
|
||||
|
||||
|
||||
##########################################
|
||||
##
|
||||
## orchestration / yankee-desktop-remix
|
||||
##
|
||||
##########################################002
|
||||
|
||||
yankee-desktop-remix-002:
|
||||
container_name: yankee-desktop-remix-002
|
||||
image: softwareshinobi/yankee-desktop-remix
|
||||
restart: unless-stopped
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile
|
||||
volumes:
|
||||
- yankee-nfs-downloads:/root/Downloads
|
||||
hostname: yankee-desktop-002
|
||||
ports:
|
||||
- "20022:22"
|
||||
- "20028:80"
|
||||
- "20029: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: ":/"
|
||||
|
||||
yankee-downloader-nfs-downloads:
|
||||
|
||||
driver_opts:
|
||||
|
||||
type: "nfs"
|
||||
|
||||
o: nfsvers=4,addr=osiris.yankee.embanet.online,nolock,hard,rw
|
||||
|
||||
device: ":/"
|
||||
|
||||
34
dev.bash
34
dev.bash
@@ -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
|
||||
@@ -1,3 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
apt install -y cron;
|
||||
42
provision/installs/download-code.bash
Normal file
42
provision/installs/download-code.bash
Normal file
@@ -0,0 +1,42 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
set -x
|
||||
|
||||
echo "##"
|
||||
echo "## launch > yankee > download consumer code"
|
||||
echo "##"
|
||||
|
||||
##
|
||||
|
||||
cd /
|
||||
|
||||
rm -rf /yankee-consumer
|
||||
|
||||
rm -rf /yankee-gnome-fire-consumer
|
||||
|
||||
git clone https://code.softwareshinobi.com/yankee/yankee-gnome-fire-consumer.git yankee-consumer
|
||||
|
||||
cd yankee-consumer
|
||||
|
||||
chmod +x *.bash
|
||||
|
||||
ls -lha
|
||||
|
||||
##
|
||||
|
||||
cd /
|
||||
|
||||
rm -rf /yankee-publisher
|
||||
|
||||
rm -rf /yankee-gnome-fire-publisher
|
||||
|
||||
git clone https://code.softwareshinobi.com/yankee/yankee-gnome-fire-publisher.git yankee-publisher
|
||||
|
||||
cd yankee-publisher
|
||||
|
||||
chmod +x *.bash
|
||||
|
||||
ls -lha
|
||||
|
||||
##
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 275 KiB After Width: | Height: | Size: 196 KiB |
@@ -19,7 +19,7 @@ clear
|
||||
|
||||
processorCount=`grep -c '^processor' /proc/cpuinfo`
|
||||
|
||||
processorCount=1
|
||||
processorCount=$((processorCount - 1))
|
||||
|
||||
echo "num cpus / "$processorCount
|
||||
|
||||
Reference in New Issue
Block a user