Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update neko #1213

Merged
merged 1 commit into from
Jan 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 15 additions & 19 deletions apps/neko/.env
Original file line number Diff line number Diff line change
@@ -1,41 +1,37 @@
W9_REPO=wordpress
W9_DIST=community
W9_REPO=m1k1o/neko:chromium
W9_DIST='community'
W9_VERSION=latest

W9_POWER_PASSWORD=1PrMxExC45LsCT
W9_POWER_PASSWORD='t7#Rh#FI29CjFo1A'

# Environments which for user settings when create application
# Named expression: W9_xxx_xxx_SET, xxx refer to file fields
W9_HTTP_PORT_SET=9001
W9_HTTP_PORT_SET='9001'
# W9_HTTPS_PORT_SET=9002
# W9_DB_PORT_SET=3306
# W9_SSH_PORT_SET=23
W9_KEY_SET="dfsjdkjf77xjxcjcj"
# W9_KEY_SET='dfsjdkjf77xjxcjcj'
W9_LOGIN_USER=admin
W9_LOGIN_PASSWORD=$W9_POWER_PASSWORD

#### -- Not allowed to edit below environments when recreate app based on existing data -- ####

W9_ID=neko
W9_ID='neko'

# W9_HTTP_PORT or W9_HTTPS_PORT is need at leaset and used for proxy for web application
# Some container (e.g teleport) need HTTPS access, then need to set this pra
W9_HTTP_PORT=80
W9_HTTPS_PORT=81
W9_HTTP_PORT=8080

W9_LOGIN_USER=admin
# W9_LOGIN_USER=admin
# use https://1password.com/zh-cn/password-generator/ to genarate 14 bit password
# this password can also use password file
W9_LOGIN_PASSWORD=$W9_POWER_PASSWORD
W9_ADMIN_PATH="/wp-login"
# W9_LOGIN_PASSWORD=$W9_POWER_PASSWORD
# W9_ADMIN_PATH="/wp-login"

# Container name's suffix must use one of the value
W9_DB_EXPOSE="mysql,postgresql,mariadb,mongodb,redis"
# W9_DB_EXPOSE="mysql,postgresql,mariadb,mongodb,redis"

# It is used when the application APP needs to set an external URL, which can be IP(or domain), IP:PORT, http(s)://IP:PORT
W9_URL=internet_ip:$W9_HTTP_PORT
W9_URL='internet_ip:$W9_HTTP_PORT'
# modifies W9_URL on init when it is true
W9_URL_REPLACE=true

W9_URL_WITH_PORT=false

W9_NETWORK=websoft9

Expand All @@ -45,4 +41,4 @@ W9_NETWORK=websoft9
# Below environment is created by apphub

#W9_NAME=""
#W9_RCODE=""
#W9_RCODE=""
48 changes: 13 additions & 35 deletions apps/neko/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,47 +4,25 @@ version: '3.8'

services:

wordpress:
image: $W9_REPO:$W9_VERSION
neko:
image: $W9_REPO
container_name: $W9_ID
restart: unless-stopped
#This is for access host from container
# extra_hosts: ["host.docker.internal:host-gateway"]
# command: |
# /bin/bash -c "ping -c 3 host.docker.internal"
logging:
driver: "json-file"
options:
max-file: "5"
max-size: 10m
deploy:
resources:
limits:
memory: 5g
cpus: '0.7'
shm_size: "2gb"
ports:
- $W9_HTTP_PORT_SET:80
env_file: .env
volumes:
- wordpress:/var/www/html
- ./src/php_exra.ini:/usr/local/etc/php/conf.d/php_exra.ini

mariadb:
image: mariadb:10.4
container_name: $W9_ID-mariadb
restart: unless-stopped
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --innodb_log_buffer_size=30M
volumes:
- mysql_data:/var/lib/mysql
- "$W9_HTTP_PORT_SET:8080"
- "52000-52100:52000-52100/udp"
environment:
MYSQL_DATABASE: $W9_ID
MYSQL_USER: $W9_ID
MYSQL_PASSWORD: $W9_POWER_PASSWORD
MYSQL_ROOT_PASSWORD: $W9_POWER_PASSWORD
NEKO_SCREEN: 1920x1080@30
NEKO_EPR: 52000-52100
NEKO_ICELITE: 1
NEKO_PASSWORD: $W9_POWER_PASSWORD
NEKO_PASSWORD_ADMIN: $W9_LOGIN_USER
env_file: .env


volumes:
wordpress:
mysql_data:
neko:

networks:
default:
Expand Down
Loading