aya/myos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wip: stalled changes

Browse Source
This commit is contained in:
Yann Autissier
2024-12-15 14:16:05 +01:00
parent d07a6aafaf
commit 65d739ee27
24 changed files with 393 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stack/User/User.mk
+1 -1
View File
@@ -2,7 +2,7 @@ ENV_VARS += USER_DOMAIN USER_HOST user_domain
MAKECMDARGS += user-exec user-exec:% user-exec@% user-run user-run:% user-run@%
USER_DOMAIN ?= $(patsubst %,$(USER).%,$(DOMAIN))
USER_HOME ?= $(shell cd ~ && pwd -P)
USER_HOST ?= $(patsubst %,$(USER).%,$(HOST))$(USER_HOST_LB)
USER_HOST ?= $(if $(APP_HOST_MULTI_USER),$(patsubst %,$(USER).%,$(HOST)))$(USER_HOST_LB)
USER_HOST_LB ?= $(if $(USER_LB),$(space)$(HOST)$(if $(HOST_LB),$(space)$(DOMAIN)),$(if $(HOST_LB),$(space)$(USER_DOMAIN)))
USER_PATH ?= $(USER_PATH_PREFIX)
USER_URIS ?= $(patsubst %,%/$(USER_PATH),$(USER_HOST))
stack/User/ipfs.mk
+1
View File
@@ -10,5 +10,6 @@ USER_IPFS_SERVICE_5001_TAGS_PROXY_TCP ?= $(call patsublist,%,urlprefix-% pro
USER_IPFS_SERVICE_5001_TAGS_URIS ?= $(strip $(if $(call servicenvs,USER_IPFS,5001,URIS),$(call urlprefix,$(USER_IPFS_SERVICE_5001_PATH),,$(call servicenvs,USER_IPFS,5001,URIS))))
USER_IPFS_SERVICE_5001_URIS ?= $(call uriprefix,USER_IPFS,5001,$(USER_URIS))
USER_IPFS_SERVICE_8080_OPTS ?= $(patsubst %/,%,$(if $(USER_PATH),strip=/$(USER_PATH)))
USER_IPFS_SERVICE_8080_PATH ?= ipfs/
USER_IPFS_SERVICE_8080_TAGS ?= $(call tagprefix,USER_IPFS,8080)
USER_IPFS_SERVICE_8080_URIS ?= $(call uriprefix,USER_IPFS,8080,$(USER_URIS))
stack/User/ipfs.yml
+4 -2
View File
@@ -63,6 +63,8 @@ services:
- IPFS_SWARM_TRANSPORTS_NETWORK_RELAY=${USER_IPFS_SWARM_TRANSPORTS_NETWORK_RELAY:-}
- LETSENCRYPT_HOST=${USER_IPFS_LETSENCRYPT_HOST}
image: ${USER_DOCKER_REPOSITORY}/ipfs:${DOCKER_IMAGE_TAG}
healthcheck:
timeout: 55s
labels:
- SERVICE_4001_CHECK_TCP=true
- SERVICE_4001_NAME=${USER_COMPOSE_SERVICE_NAME}-ipfs-4001
@@ -88,9 +90,9 @@ services:
soft: 65536
hard: 65536
volumes:
- dns:/dns:delegated
- home:/home:delegated
volumes:
dns:
home:
external: true
name: ${HOST_DOCKER_VOLUME}_home
stack/drone/drone.mk
+1 -1
View File
@@ -5,6 +5,6 @@ DRONE_SERVER_HOST ?= $(DRONE_SERVICE_NAME).$(firstword $
DRONE_SERVICE_NAME ?= drone
DRONE_SERVICE_80_NAME ?= $(DRONE_SERVICE_NAME)
DRONE_SERVICE_80_TAGS ?= $(call tagprefix,drone,80)
DRONE_USER_CREATE ?= $(USER):$(GIT_USER),admin:true
DRONE_USER_CREATE ?= username:$(GIT_USER),admin:true
DRONE_USER_FILTER ?= $(GIT_USER)
ENV_VARS += DRONE_RUNNER_NAME DRONE_SERVER_HOST DRONE_USER_CREATE DRONE_USER_FILTER DRONE_SERVICE_80_TAGS
stack/drone/drone.yml
+7 -4
View File
@@ -4,9 +4,12 @@ services:
drone:
environment:
- DRONE_GIT_ALWAYS_AUTH=${DRONE_GIT_ALWAYS_AUTH:-false}
- DRONE_GITEA_CLIENT_ID=${DRONE_GITEA_CLIENT_ID:-}
- DRONE_GITEA_CLIENT_SECRET=${DRONE_GITEA_CLIENT_SECRET:-}
- DRONE_GITEA_SERVER=${DRONE_GITEA_SERVER:-}
- DRONE_GITHUB_SERVER=${DRONE_GITHUB_SERVER:-https://github.com}
- DRONE_GITHUB_CLIENT_ID=${DRONE_GITHUB_CLIENT_ID}
- DRONE_GITHUB_CLIENT_SECRET=${DRONE_GITHUB_CLIENT_SECRET}
- DRONE_GITHUB_CLIENT_ID=${DRONE_GITHUB_CLIENT_ID:-}
- DRONE_GITHUB_CLIENT_SECRET=${DRONE_GITHUB_CLIENT_SECRET:-}
- DRONE_LOGS_COLOR=${DRONE_LOGS_COLOR:-true}
- DRONE_LOGS_PRETTY=${DRONE_LOGS_PRETTY:-true}
- DRONE_PROMETHEUS_ANONYMOUS_ACCESS=${DRONE_PROMETHEUS_ANONYMOUS_ACCESS:-true}
@@ -14,8 +17,8 @@ services:
- DRONE_SERVER_HOST=${DRONE_SERVER_HOST:-drone}
- DRONE_SERVER_PROTO=${DRONE_SERVER_PROTO:-http}
- DRONE_TLS_AUTOCERT=${DRONE_TLS_AUTOCERT:-true}
- DRONE_USER_CREATE=${DRONE_USER_CREATE}
- DRONE_USER_FILTER=${DRONE_USER_FILTER}
- DRONE_USER_CREATE=${DRONE_USER_CREATE:-}
- DRONE_USER_FILTER=${DRONE_USER_FILTER:-}
labels:
- SERVICE_80_CHECK_TCP=true
- SERVICE_80_NAME=${COMPOSE_SERVICE_NAME}-drone-80
stack/duniter/v2s.mk
+1 -1
View File
@@ -7,7 +7,7 @@ DUNITER_UI_WS_URL ?= wss://$(DUNITER_V2S_SERVICE_NAME).$
DUNITER_V2S_DUNITER_CHAIN_NAME ?= gdev
DUNITER_V2S_DUNITER_NODE_NAME ?= $(USER)-$(ENV)-$(DUNITER_V2S_DUNITER_PRUNING_PROFILE)
DUNITER_V2S_DUNITER_PUBLIC_ADDR ?= /dns/$(DUNITER_V2S_SERVICE_NAME).$(firstword $(APP_HOST))/tcp/443/wss
DUNITER_V2S_DUNITER_PRUNING_PROFILE ?= archive
DUNITER_V2S_DUNITER_PRUNING_PROFILE ?= default
DUNITER_V2S_SERVICE_NAME ?= $(DUNITER_V2S_DUNITER_CHAIN_NAME)
DUNITER_V2S_SERVICE_9615_PATH ?= metrics/
DUNITER_V2S_SERVICE_9615_TAGS ?= $(call tagprefix,DUNITER_V2S,9615)
stack/host/ipfs.mk
+1 -1
View File
@@ -6,5 +6,5 @@ HOST_IPFS_SERVICE_5001_PATH ?= api/
HOST_IPFS_SERVICE_5001_TAGS ?= $(call tagprefix,HOST_IPFS,5001)
HOST_IPFS_SERVICE_8080_ENVS ?= host
HOST_IPFS_SERVICE_8080_TAGS ?= $(call urlprefix,,,$(HOST_IPFS_SERVICE_8080_URIS) $(call servicenvs,HOST_IPFS,8080,URIS))
HOST_IPFS_SERVICE_8080_URIS ?= $(call uriprefix,ipfs *.ipns)
HOST_IPFS_SERVICE_8080_URIS ?= $(call uriprefix,ipfs *.ipns *.ipfs)
HOST_IPFS_UFW_UPDATE ?= 4001/tcp 4001/udp 8080
stack/host/ipfs.yml
+2 -2
View File
@@ -31,7 +31,7 @@ services:
- IPFS_BOOTSTRAP=${HOST_IPFS_BOOTSTRAP:-}
- IPFS_DATASTORE_GCPERIOD=${HOST_IPFS_DATASTORE_GCPERIOD:-}
- IPFS_DISK_USAGE_PERCENT=${HOST_IPFS_DISK_USAGE_PERCENT:-}
- IPFS_EXPERIMENTAL_ACCELERATEDDHTCLIENT=${HOST_IPFS_EXPERIMENTAL_ACCELERATEDDHTCLIENT:-true}
- IPFS_EXPERIMENTAL_ACCELERATEDDHTCLIENT=${HOST_IPFS_EXPERIMENTAL_ACCELERATEDDHTCLIENT:-}
- IPFS_EXPERIMENTAL_FILESTOREENABLED=${HOST_IPFS_EXPERIMENTAL_FILESTOREENABLED:-}
- IPFS_EXPERIMENTAL_GRAPHSYNCENABLED=${HOST_IPFS_EXPERIMENTAL_GRAPHSYNCENABLED:-}
- IPFS_EXPERIMENTAL_LIBP2PSTREAMMOUNTING=${HOST_IPFS_EXPERIMENTAL_LIBP2PSTREAMMOUNTING:-true}
@@ -62,7 +62,7 @@ services:
- IPFS_SWARM_RELAYSERVICE_ENABLED=${HOST_IPFS_SWARM_RELAYSERVICE_ENABLED:-}
- IPFS_SWARM_TRANSPORTS_NETWORK_RELAY=${HOST_IPFS_SWARM_TRANSPORTS_NETWORK_RELAY:-}
healthcheck:
timeout: 5s
timeout: 55s
image: ${HOST_DOCKER_REPOSITORY}/ipfs:${DOCKER_IMAGE_TAG}
labels:
- SERVICE_4001_CHECK_TCP=true
stack/host/ldap.mk
+2
View File
@@ -0,0 +1,2 @@
HOST_389DS_VERSION := 2.4.4
ENV_VARS += HOST_389DS_VERSION
stack/host/ldap.yml
+16
View File
@@ -0,0 +1,16 @@
version: '3.6'
services:
389ds:
build:
args:
- BUILD_VERSION=${HOST_389DS_VERSION}
- DOCKER_BUILD_DIR=docker/389ds
context: ../..
dockerfile: docker/389ds/Dockerfile
container_name: ${HOST_COMPOSE_PROJECT_NAME}-389ds
hostname: ${HOSTNAME}
image: ${HOST_DOCKER_REPOSITORY}/389ds:${DOCKER_IMAGE_TAG}
network_mode: host
restart: always
stack/host/nginx.mk
+1 -1
View File
@@ -1,7 +1,7 @@
ENV_VARS += HOST_NGINX_LETSENCRYPT_HOST HOST_NGINX_SERVICE_80_TAGS HOST_NGINX_SERVICE_443_TAGS HOST_NGINX_VIRTUAL_HOST
HOST_NGINX_HOST_URIS ?= true
HOST_NGINX_LETSENCRYPT_HOST ?= $(subst $(space),$(comma),$(filter-out *.%,$(subst $(comma),$(space),$(HOST_NGINX_VIRTUAL_HOST))))
HOST_NGINX_SERVICE_HOST_URIS ?= */
HOST_NGINX_SERVICE_HOST_URIS ?= */ */.well-known/acme-challenge/
HOST_NGINX_SERVICE_HOST ?= $(subst $(comma),$(space),$(HOST_NGINX_VIRTUAL_HOST))
HOST_NGINX_SERVICE_80_HOST ?= $(HOST_NGINX_SERVICE_HOST)
HOST_NGINX_SERVICE_80_TAGS ?= $(call urlprefix,,,$(HOST_NGINX_SERVICE_80_URIS) $(call servicenvs,HOST_NGINX,80,URIS))
stack/host/volumes.backup.local.yml
+10
View File
@@ -0,0 +1,10 @@
version: '3.6'
volumes:
backup:
driver: local
driver_opts:
device: /var/lib/backup
o: bind
type: none
stack/ipfs/ipfs.mk
+1 -1
View File
@@ -7,7 +7,7 @@ IPFS_SERVICE_5001_TAGS ?= $(call tagprefix,ipfs,5001)
IPFS_SERVICE_8080_CHECK_HTTP ?= /ipfs/QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn
IPFS_SERVICE_8080_TAGS ?= $(call urlprefix,,,$(IPFS_SERVICE_8080_URIS))
IPFS_SERVICE_8080_URIS ?= $(call uriprefix,ipfs *.ipns)
IPFS_VERSION ?= 0.16.0
IPFS_VERSION ?= 0.24.0
.PHONY: bootstrap-stack-ipfs
bootstrap-stack-ipfs: ~/.ipfs setup-sysctl
stack/skx/rss2email.yml
+21
View File
@@ -0,0 +1,21 @@
version: "3.8"
services:
rss2email:
command: daemon -verbose ${RSS2EMAIL_EMAIL:-${MAIL}}
entrypoint: rss2email
working_dir: /app
user: app
environment:
- TZ=UTC
- SMTP_USERNAME=${RSS2EMAIL_SMTP_USERNAME:-}
- SMTP_PASSWORD=${RSS2EMAIL_PASSWORD:-}
- SMTP_HOST=smtp
- SMTP_PORT=587
restart: unless-stopped
image: ghcr.io/skx/rss2email:master
volumes:
- rss2email-data:/app/.rss2email
volumes:
rss2email-data:
stack/whisper/Caddyfile
+17
View File
@@ -0,0 +1,17 @@
:80 {
header {
Access-Control-Allow-Origin "*"
Access-Control-Allow-Credentials true
Access-Control-Allow-Methods "*"
Access-Control-Allow-Headers "*"
defer
}
encode zstd gzip
reverse_proxy whisper-frontend:5173
handle_path /api/* {
reverse_proxy whisper-backend:3000
}
}
stack/whisper/whisper.yml
+69
View File
@@ -0,0 +1,69 @@
version: "3.9"
services:
whisper-asr:
image: onerahmet/openai-whisper-asr-webservice:v1.1.1
environment:
ASR_MODEL: ${WHISPER_MODEL-large}
volumes:
- whisper-cache:/root/.cache/whisper
restart: unless-stopped
expose:
- 9000
networks:
- private
whisper-translate:
image: libretranslate/libretranslate:latest
restart: unless-stopped
command: --disable-web-ui --debug
environment:
LT_DISABLE_WEB_UI: True
LT_DEBUG: True
expose:
- 5000
networks:
- private
whisper-backend:
image: pluja/web-whisper-backend:latest
environment:
UPLOAD_DIR: /app/uploads
ASR_ENDPOINT: whisper-asr:9000
LT_ENDPOINT: whisper-translate:5000
volumes:
- whisper-data:/app/db
- whisper-files:/app/uploads
restart: unless-stopped
expose:
- 3000
networks:
- private
whisper-frontend:
image: pluja/web-whisper-frontend:latest
restart: unless-stopped
expose:
- 5173
networks:
- private
whisper-proxy:
image: caddy:2-alpine
restart: unless-stopped
labels:
SERVICE_80_CHECK_HTTP: /
SERVICE_80_NAME: ${COMPOSE_SERVICE_NAME}-proxy-80
SERVICE_80_TAGS: urlprefix-transcript.asycn.io/*
ports:
- 80
volumes:
- ./Caddyfile:/etc/caddy/Caddyfile
networks:
- private
- public
volumes:
whisper-cache:
whisper-data:
whisper-files: