Compare commits
No commits in common. "0a6e4d43e281949e0566e658014c42e34dedf299" and "2f8a30d715797fd9470828a52234c68c4cfffaf0" have entirely different histories.
0a6e4d43e2
...
2f8a30d715
@ -1,43 +0,0 @@
|
|||||||
# https://github.com/dockur/windows
|
|
||||||
services:
|
|
||||||
macos:
|
|
||||||
image: dockurr/windows
|
|
||||||
container_name: windows
|
|
||||||
environment:
|
|
||||||
VERSION: "11"
|
|
||||||
DISK_SIZE: "50G"
|
|
||||||
RAM_SIZE: "4G"
|
|
||||||
CPU_CORES: "4"
|
|
||||||
# DHCP: "Y" # if enabled you must create a macvlan
|
|
||||||
USERNAME: "james"
|
|
||||||
PASSWORD: "jimsgarage"
|
|
||||||
LANGUAGE: "ENGLISH"
|
|
||||||
REGION: "en-GB"
|
|
||||||
KEYBOARD: "en-GB"
|
|
||||||
GPU: "Y"
|
|
||||||
devices:
|
|
||||||
- /dev/kvm
|
|
||||||
- /dev/net/tun
|
|
||||||
- /dev/dri/renderD128
|
|
||||||
- /dev/vfio
|
|
||||||
- /dev/dri/card0
|
|
||||||
cap_add:
|
|
||||||
- NET_ADMIN
|
|
||||||
ports:
|
|
||||||
- 8007:8006
|
|
||||||
- 3389:3389/tcp
|
|
||||||
- 3389:3389/udp
|
|
||||||
volumes:
|
|
||||||
- ./windows:/storage
|
|
||||||
restart: always
|
|
||||||
stop_grace_period: 2m
|
|
||||||
networks:
|
|
||||||
windows:
|
|
||||||
ipv4_address: 172.70.25.2
|
|
||||||
|
|
||||||
networks:
|
|
||||||
windows:
|
|
||||||
ipam:
|
|
||||||
config:
|
|
||||||
- subnet: 172.70.25.0/29
|
|
||||||
name: windows
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
# https://github.com/dockur/macos
|
|
||||||
services:
|
|
||||||
macos:
|
|
||||||
image: dockurr/macos
|
|
||||||
container_name: macos
|
|
||||||
environment:
|
|
||||||
VERSION: "15"
|
|
||||||
DISK_SIZE: "50G"
|
|
||||||
RAM_SIZE: "6G"
|
|
||||||
CPU_CORES: "4"
|
|
||||||
# DHCP: "Y" # if enabled you must create a macvlan
|
|
||||||
devices:
|
|
||||||
- /dev/kvm
|
|
||||||
- /dev/net/tun
|
|
||||||
cap_add:
|
|
||||||
- NET_ADMIN
|
|
||||||
ports:
|
|
||||||
- 8006:8006
|
|
||||||
- 5900:5900/tcp
|
|
||||||
- 5900:5900/udp
|
|
||||||
volumes:
|
|
||||||
- ./macos:/storage
|
|
||||||
restart: always
|
|
||||||
stop_grace_period: 2m
|
|
||||||
networks:
|
|
||||||
macos:
|
|
||||||
ipv4_address: 172.70.20.2
|
|
||||||
|
|
||||||
networks:
|
|
||||||
macos:
|
|
||||||
ipam:
|
|
||||||
config:
|
|
||||||
- subnet: 172.70.20.0/29
|
|
||||||
name: macos
|
|
||||||
@ -13,7 +13,7 @@ services:
|
|||||||
env_file:
|
env_file:
|
||||||
- .env # store other secrets e.g., dashboard password
|
- .env # store other secrets e.g., dashboard password
|
||||||
networks:
|
networks:
|
||||||
- proxy
|
proxy:
|
||||||
ports:
|
ports:
|
||||||
- 80:80
|
- 80:80
|
||||||
- 443:443
|
- 443:443
|
||||||
@ -51,4 +51,4 @@ services:
|
|||||||
|
|
||||||
networks:
|
networks:
|
||||||
proxy:
|
proxy:
|
||||||
external: true # or comment this line to auto create the network
|
external: true # or comment this line to auto create the network
|
||||||
18
Twenty/.env
18
Twenty/.env
@ -1,18 +0,0 @@
|
|||||||
TAG=latest
|
|
||||||
|
|
||||||
#PG_DATABASE_USER=postgres
|
|
||||||
PG_DATABASE_PASSWORD=fce184f90775eed9fb451e2fab23bc00a81e2fb6819002ae48a27f0719b7baaa
|
|
||||||
#PG_DATABASE_HOST=db
|
|
||||||
#PG_DATABASE_PORT=5432
|
|
||||||
#REDIS_URL=redis://redis:6379
|
|
||||||
|
|
||||||
SERVER_URL=https://twenty.jimsgarage.co.uk
|
|
||||||
|
|
||||||
# Use openssl rand -base64 32 for each secret
|
|
||||||
APP_SECRET=xjwtdYVQo4l/ce1LDF5qhmvYx4Zzhb7l2k0YL704EvM=
|
|
||||||
|
|
||||||
STORAGE_TYPE=local
|
|
||||||
|
|
||||||
# STORAGE_S3_REGION=eu-west3
|
|
||||||
# STORAGE_S3_NAME=my-bucket
|
|
||||||
# STORAGE_S3_ENDPOINT=
|
|
||||||
@ -1,155 +0,0 @@
|
|||||||
name: twenty
|
|
||||||
|
|
||||||
services:
|
|
||||||
server:
|
|
||||||
image: twentycrm/twenty:${TAG:-latest}
|
|
||||||
volumes:
|
|
||||||
- server-local-data:/app/packages/twenty-server/.local-storage
|
|
||||||
ports:
|
|
||||||
- "3000:3000"
|
|
||||||
environment:
|
|
||||||
NODE_PORT: 3000
|
|
||||||
PG_DATABASE_URL: postgres://${PG_DATABASE_USER:-postgres}:${PG_DATABASE_PASSWORD:-postgres}@${PG_DATABASE_HOST:-db}:${PG_DATABASE_PORT:-5432}/default
|
|
||||||
SERVER_URL: ${SERVER_URL}
|
|
||||||
REDIS_URL: ${REDIS_URL:-redis://redis:6379}
|
|
||||||
DISABLE_DB_MIGRATIONS: ${DISABLE_DB_MIGRATIONS}
|
|
||||||
DISABLE_CRON_JOBS_REGISTRATION: ${DISABLE_CRON_JOBS_REGISTRATION}
|
|
||||||
|
|
||||||
STORAGE_TYPE: ${STORAGE_TYPE}
|
|
||||||
STORAGE_S3_REGION: ${STORAGE_S3_REGION}
|
|
||||||
STORAGE_S3_NAME: ${STORAGE_S3_NAME}
|
|
||||||
STORAGE_S3_ENDPOINT: ${STORAGE_S3_ENDPOINT}
|
|
||||||
|
|
||||||
APP_SECRET: ${APP_SECRET:-replace_me_with_a_random_string}
|
|
||||||
# MESSAGING_PROVIDER_GMAIL_ENABLED: ${MESSAGING_PROVIDER_GMAIL_ENABLED}
|
|
||||||
# CALENDAR_PROVIDER_GOOGLE_ENABLED: ${CALENDAR_PROVIDER_GOOGLE_ENABLED}
|
|
||||||
# AUTH_GOOGLE_CLIENT_ID: ${AUTH_GOOGLE_CLIENT_ID}
|
|
||||||
# AUTH_GOOGLE_CLIENT_SECRET: ${AUTH_GOOGLE_CLIENT_SECRET}
|
|
||||||
# AUTH_GOOGLE_CALLBACK_URL: ${AUTH_GOOGLE_CALLBACK_URL}
|
|
||||||
# AUTH_GOOGLE_APIS_CALLBACK_URL: ${AUTH_GOOGLE_APIS_CALLBACK_URL}
|
|
||||||
|
|
||||||
# CALENDAR_PROVIDER_MICROSOFT_ENABLED: ${CALENDAR_PROVIDER_MICROSOFT_ENABLED}
|
|
||||||
# MESSAGING_PROVIDER_MICROSOFT_ENABLED: ${MESSAGING_PROVIDER_MICROSOFT_ENABLED}
|
|
||||||
# AUTH_MICROSOFT_ENABLED: ${AUTH_MICROSOFT_ENABLED}
|
|
||||||
# AUTH_MICROSOFT_CLIENT_ID: ${AUTH_MICROSOFT_CLIENT_ID}
|
|
||||||
# AUTH_MICROSOFT_CLIENT_SECRET: ${AUTH_MICROSOFT_CLIENT_SECRET}
|
|
||||||
# AUTH_MICROSOFT_CALLBACK_URL: ${AUTH_MICROSOFT_CALLBACK_URL}
|
|
||||||
# AUTH_MICROSOFT_APIS_CALLBACK_URL: ${AUTH_MICROSOFT_APIS_CALLBACK_URL}
|
|
||||||
|
|
||||||
# EMAIL_FROM_ADDRESS: ${EMAIL_FROM_ADDRESS:-contact@yourdomain.com}
|
|
||||||
# EMAIL_FROM_NAME: ${EMAIL_FROM_NAME:-"John from YourDomain"}
|
|
||||||
# EMAIL_SYSTEM_ADDRESS: ${EMAIL_SYSTEM_ADDRESS:-system@yourdomain.com}
|
|
||||||
# EMAIL_DRIVER: ${EMAIL_DRIVER:-smtp}
|
|
||||||
# EMAIL_SMTP_HOST: ${EMAIL_SMTP_HOST:-smtp.gmail.com}
|
|
||||||
# EMAIL_SMTP_PORT: ${EMAIL_SMTP_PORT:-465}
|
|
||||||
# EMAIL_SMTP_USER: ${EMAIL_SMTP_USER:-}
|
|
||||||
# EMAIL_SMTP_PASSWORD: ${EMAIL_SMTP_PASSWORD:-}
|
|
||||||
|
|
||||||
depends_on:
|
|
||||||
db:
|
|
||||||
condition: service_healthy
|
|
||||||
healthcheck:
|
|
||||||
test: curl --fail http://localhost:3000/healthz
|
|
||||||
interval: 5s
|
|
||||||
timeout: 5s
|
|
||||||
retries: 20
|
|
||||||
restart: always
|
|
||||||
networks:
|
|
||||||
- proxy
|
|
||||||
- twenty
|
|
||||||
labels:
|
|
||||||
- "traefik.enable=true"
|
|
||||||
- "traefik.docker.network=proxy"
|
|
||||||
- "traefik.http.routers.twenty.entrypoints=http"
|
|
||||||
- "traefik.http.routers.twenty.rule=Host(`twenty.jimsgarage.co.uk`)"
|
|
||||||
- "traefik.http.middlewares.twenty-https-redirect.redirectscheme.scheme=https"
|
|
||||||
- "traefik.http.routers.twenty.middlewares=twenty-https-redirect"
|
|
||||||
- "traefik.http.routers.twenty-secure.entrypoints=https"
|
|
||||||
- "traefik.http.routers.twenty-secure.rule=Host(`twenty.jimsgarage.co.uk`)"
|
|
||||||
- "traefik.http.routers.twenty-secure.tls=true"
|
|
||||||
- "traefik.http.routers.twenty-secure.tls.certresolver=cloudflare"
|
|
||||||
- "traefik.http.routers.twenty-secure.service=twenty"
|
|
||||||
- "traefik.http.services.twenty.loadbalancer.server.port=3000"
|
|
||||||
|
|
||||||
worker:
|
|
||||||
image: twentycrm/twenty:${TAG:-latest}
|
|
||||||
volumes:
|
|
||||||
- server-local-data:/app/packages/twenty-server/.local-storage
|
|
||||||
command: ["yarn", "worker:prod"]
|
|
||||||
environment:
|
|
||||||
PG_DATABASE_URL: postgres://${PG_DATABASE_USER:-postgres}:${PG_DATABASE_PASSWORD:-postgres}@${PG_DATABASE_HOST:-db}:${PG_DATABASE_PORT:-5432}/default
|
|
||||||
SERVER_URL: ${SERVER_URL}
|
|
||||||
REDIS_URL: ${REDIS_URL:-redis://redis:6379}
|
|
||||||
DISABLE_DB_MIGRATIONS: "true" # it already runs on the server
|
|
||||||
DISABLE_CRON_JOBS_REGISTRATION: "true" # it already runs on the server
|
|
||||||
|
|
||||||
STORAGE_TYPE: ${STORAGE_TYPE}
|
|
||||||
STORAGE_S3_REGION: ${STORAGE_S3_REGION}
|
|
||||||
STORAGE_S3_NAME: ${STORAGE_S3_NAME}
|
|
||||||
STORAGE_S3_ENDPOINT: ${STORAGE_S3_ENDPOINT}
|
|
||||||
|
|
||||||
APP_SECRET: ${APP_SECRET:-replace_me_with_a_random_string}
|
|
||||||
# MESSAGING_PROVIDER_GMAIL_ENABLED: ${MESSAGING_PROVIDER_GMAIL_ENABLED}
|
|
||||||
# CALENDAR_PROVIDER_GOOGLE_ENABLED: ${CALENDAR_PROVIDER_GOOGLE_ENABLED}
|
|
||||||
# AUTH_GOOGLE_CLIENT_ID: ${AUTH_GOOGLE_CLIENT_ID}
|
|
||||||
# AUTH_GOOGLE_CLIENT_SECRET: ${AUTH_GOOGLE_CLIENT_SECRET}
|
|
||||||
# AUTH_GOOGLE_CALLBACK_URL: ${AUTH_GOOGLE_CALLBACK_URL}
|
|
||||||
# AUTH_GOOGLE_APIS_CALLBACK_URL: ${AUTH_GOOGLE_APIS_CALLBACK_URL}
|
|
||||||
|
|
||||||
# CALENDAR_PROVIDER_MICROSOFT_ENABLED: ${CALENDAR_PROVIDER_MICROSOFT_ENABLED}
|
|
||||||
# MESSAGING_PROVIDER_MICROSOFT_ENABLED: ${MESSAGING_PROVIDER_MICROSOFT_ENABLED}
|
|
||||||
# AUTH_MICROSOFT_ENABLED: ${AUTH_MICROSOFT_ENABLED}
|
|
||||||
# AUTH_MICROSOFT_CLIENT_ID: ${AUTH_MICROSOFT_CLIENT_ID}
|
|
||||||
# AUTH_MICROSOFT_CLIENT_SECRET: ${AUTH_MICROSOFT_CLIENT_SECRET}
|
|
||||||
# AUTH_MICROSOFT_CALLBACK_URL: ${AUTH_MICROSOFT_CALLBACK_URL}
|
|
||||||
# AUTH_MICROSOFT_APIS_CALLBACK_URL: ${AUTH_MICROSOFT_APIS_CALLBACK_URL}
|
|
||||||
|
|
||||||
# EMAIL_FROM_ADDRESS: ${EMAIL_FROM_ADDRESS:-contact@yourdomain.com}
|
|
||||||
# EMAIL_FROM_NAME: ${EMAIL_FROM_NAME:-"John from YourDomain"}
|
|
||||||
# EMAIL_SYSTEM_ADDRESS: ${EMAIL_SYSTEM_ADDRESS:-system@yourdomain.com}
|
|
||||||
# EMAIL_DRIVER: ${EMAIL_DRIVER:-smtp}
|
|
||||||
# EMAIL_SMTP_HOST: ${EMAIL_SMTP_HOST:-smtp.gmail.com}
|
|
||||||
# EMAIL_SMTP_PORT: ${EMAIL_SMTP_PORT:-465}
|
|
||||||
# EMAIL_SMTP_USER: ${EMAIL_SMTP_USER:-}
|
|
||||||
# EMAIL_SMTP_PASSWORD: ${EMAIL_SMTP_PASSWORD:-}
|
|
||||||
|
|
||||||
depends_on:
|
|
||||||
db:
|
|
||||||
condition: service_healthy
|
|
||||||
server:
|
|
||||||
condition: service_healthy
|
|
||||||
restart: always
|
|
||||||
networks:
|
|
||||||
- twenty
|
|
||||||
|
|
||||||
db:
|
|
||||||
image: postgres:16
|
|
||||||
volumes:
|
|
||||||
- db-data:/var/lib/postgresql/data
|
|
||||||
environment:
|
|
||||||
POSTGRES_USER: ${PG_DATABASE_USER:-postgres}
|
|
||||||
POSTGRES_PASSWORD: ${PG_DATABASE_PASSWORD:-postgres}
|
|
||||||
healthcheck:
|
|
||||||
test: pg_isready -U ${PG_DATABASE_USER:-postgres} -h localhost -d postgres
|
|
||||||
interval: 5s
|
|
||||||
timeout: 5s
|
|
||||||
retries: 10
|
|
||||||
restart: always
|
|
||||||
networks:
|
|
||||||
- twenty
|
|
||||||
|
|
||||||
redis:
|
|
||||||
image: redis
|
|
||||||
restart: always
|
|
||||||
command: ["--maxmemory-policy", "noeviction"]
|
|
||||||
networks:
|
|
||||||
- twenty
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
db-data:
|
|
||||||
server-local-data:
|
|
||||||
|
|
||||||
networks:
|
|
||||||
twenty:
|
|
||||||
proxy:
|
|
||||||
external: true
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
# Tests:
|
|
||||||
|
|
||||||
# H265 4K -> H264 4K
|
|
||||||
- AMD: sudo ffmpeg -hwaccel vaapi -hwaccel_device /dev/dri/renderD128 -hwaccel_output_format vaapi -i bbb-3840x2160-cfg02.mkv -c:v h264_vaapi output.mp4
|
|
||||||
- Intel: sudo ffmpeg -hwaccel qsv -hwaccel_device /dev/dri/renderD128 -hwaccel_output_format qsv -i bbb-3840x2160-cfg02.mkv -c:v h264_qsv output.mp4
|
|
||||||
|
|
||||||
# H265 4K -> H264 1080P
|
|
||||||
- AMD: sudo ffmpeg -hwaccel vaapi -hwaccel_device /dev/dri/renderD128 -hwaccel_output_format vaapi -i bbb-3840x2160-cfg02.mkv -vf "scale_vaapi=w=1920:h=1080" -c:v h264_vaapi output.mp4
|
|
||||||
- Intel: sudo ffmpeg -hwaccel qsv -hwaccel_device /dev/dri/renderD128 -hwaccel_output_format qsv -i bbb-3840x2160-cfg02.mkv -vf "scale_qsv=w=1920:h=1080" -c:v h264_qsv output.mp4
|
|
||||||
|
|
||||||
# H265 4K -> H265 1080P
|
|
||||||
- AMD: sudo ffmpeg -hwaccel vaapi -hwaccel_device /dev/dri/renderD128 -hwaccel_output_format vaapi -i bbb-3840x2160-cfg02.mkv -vf "scale_vaapi=w=1920:h=1080" -c:v hevc_vaapi output.mp4
|
|
||||||
- Intel: sudo ffmpeg -hwaccel qsv -hwaccel_device /dev/dri/renderD128 -hwaccel_output_format qsv -i bbb-3840x2160-cfg02.mkv -vf "scale_qsv=w=1920:h=1080" -c:v hevc_qsv output.mp4
|
|
||||||
|
|
||||||
# AV1 1080P -> H265 1080P
|
|
||||||
- AMD: sudo ffmpeg -hwaccel vaapi -hwaccel_device /dev/dri/renderD128 -hwaccel_output_format vaapi -i Sparks-5994fps-AV1-10bit-1920x1080-2194kbps.mp4 -c:v hevc_vaapi output.mp4
|
|
||||||
- Intel: sudo ffmpeg -hwaccel qsv -hwaccel_device /dev/dri/renderD128 -hwaccel_output_format qsv -i Sparks-5994fps-AV1-10bit-1920x1080-2194kbps.mp4 -c:v hevc_qsv output.mp4
|
|
||||||
|
|
||||||
# AV1 1080P -> H264 1080P
|
|
||||||
- AMD: sudo ffmpeg -hwaccel vaapi -hwaccel_device /dev/dri/renderD128 -hwaccel_output_format vaapi -i Sparks-5994fps-AV1-10bit-1920x1080-2194kbps.mp4 -vf "scale_vaapi=w=1920:h=1080" -c:v h264_vaapi output.mp4
|
|
||||||
- Intel: sudo ffmpeg -hwaccel qsv -hwaccel_device /dev/dri/renderD128 -hwaccel_output_format qsv -i Sparks-5994fps-AV1-10bit-1920x1080-2194kbps.mp4 -c:v h264_qsv output.mp4
|
|
||||||
|
|
||||||
# H264 4K -> H264 1080P
|
|
||||||
- AMD: sudo ffmpeg -hwaccel vaapi -hwaccel_device /dev/dri/renderD128 -hwaccel_output_format vaapi -i Meridian_UHD4k5994_HDR_P3PQ.mp4 -vf "scale_vaapi=w=1920:h=1080" -c:v h264_vaapi output.mp4
|
|
||||||
- Intel: sudo ffmpeg -hwaccel qsv -hwaccel_device /dev/dri/renderD128 -hwaccel_output_format qsv -i Meridian_UHD4k5994_HDR_P3PQ.mp4 -vf "scale_qsv=w=1920:h=1080" -c:v h264_qsv output.mp4
|
|
||||||
Loading…
Reference in New Issue
Block a user