Skip to content

Commit 0b4d672

Browse files
authored
Merge pull request #1246 from Websoft9/update-dashy-c7bd6fe6
Update dashy
2 parents 9219578 + e1e7a23 commit 0b4d672

File tree

12 files changed

+23
-211
lines changed

12 files changed

+23
-211
lines changed

apps/dashy/.env

Lines changed: 9 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,11 @@
1-
W9_REPO=wordpress
2-
W9_DIST=community
3-
W9_VERSION=latest
4-
5-
W9_POWER_PASSWORD=1PrMxExC45LsCT
6-
7-
# Environments which for user settings when create application
8-
# Named expression: W9_xxx_xxx_SET, xxx refer to file fields
9-
W9_HTTP_PORT_SET=9001
10-
# W9_HTTPS_PORT_SET=9002
11-
# W9_DB_PORT_SET=3306
12-
# W9_SSH_PORT_SET=23
13-
W9_KEY_SET="dfsjdkjf77xjxcjcj"
14-
15-
#### -- Not allowed to edit below environments when recreate app based on existing data -- ####
16-
17-
W9_ID=dashy
18-
19-
# W9_HTTP_PORT or W9_HTTPS_PORT is need at leaset and used for proxy for web application
20-
# Some container (e.g teleport) need HTTPS access, then need to set this pra
21-
W9_HTTP_PORT=80
22-
W9_HTTPS_PORT=81
23-
24-
W9_LOGIN_USER=admin
25-
# use https://1password.com/zh-cn/password-generator/ to genarate 14 bit password
26-
# this password can also use password file
27-
W9_LOGIN_PASSWORD=$W9_POWER_PASSWORD
28-
W9_ADMIN_PATH="/wp-login"
29-
30-
# Container name's suffix must use one of the value
31-
W9_DB_EXPOSE="mysql,postgresql,mariadb,mongodb,redis"
32-
33-
# It is used when the application APP needs to set an external URL, which can be IP(or domain), IP:PORT
34-
# If have protocols, should be set it in the APP's ENV
35-
W9_URL=internet_ip:$W9_HTTP_PORT_SET
36-
# modifies W9_URL on init when it is true
37-
W9_URL_REPLACE=true
38-
1+
W9_REPO=lissy93/dashy
2+
W9_DIST='community'
3+
W9_VERSION='latest'
4+
W9_HTTP_PORT_SET='9001'
5+
W9_ID='dashy'
6+
W9_HTTP_PORT=8080
7+
W9_URL='internet_ip:$W9_HTTP_PORT_SET'
398
W9_NETWORK=websoft9
409

41-
#### ----------------------------------------------------------------------------------------- ####
42-
43-
44-
# Below environment is created by apphub
45-
46-
#W9_NAME=""
47-
#W9_RCODE=""
10+
#### https://dashy.to/docs/management ####
11+
NODE_ENV=production

apps/dashy/Dockerfile

Lines changed: 0 additions & 21 deletions
This file was deleted.

apps/dashy/Notes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
# Appname
2-
## FAQ
1+
# Dashy
2+
## Multi language support

apps/dashy/README.jinja2

Lines changed: 0 additions & 26 deletions
This file was deleted.

apps/dashy/docker-compose.yml

Lines changed: 12 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,26 @@
1-
# image,docs: https://hub.docker.com/_/wordpress/
1+
# image:https://github.com/lissy93/dashy
2+
# docs: https://dashy.to/docs/deployment#using-docker-compose
23

34
services:
45

5-
wordpress:
6+
dashy:
67
image: $W9_REPO:$W9_VERSION
78
container_name: $W9_ID
89
restart: unless-stopped
9-
#This is for access host from container
10-
# extra_hosts: ["host.docker.internal:host-gateway"]
11-
# command: |
12-
# /bin/bash -c "ping -c 3 host.docker.internal"
13-
logging:
14-
driver: "json-file"
15-
options:
16-
max-file: "5"
17-
max-size: 10m
18-
deploy:
19-
resources:
20-
limits:
21-
memory: 5g
22-
cpus: '0.7'
2310
ports:
24-
- $W9_HTTP_PORT_SET:80
11+
- $W9_HTTP_PORT_SET:8080
2512
env_file: .env
2613
volumes:
27-
- wordpress:/var/www/html
28-
- ./src/php_exra.ini:/usr/local/etc/php/conf.d/php_exra.ini
29-
30-
mariadb:
31-
image: mariadb:10.4
32-
container_name: $W9_ID-mariadb
33-
restart: unless-stopped
34-
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --innodb_log_buffer_size=30M
35-
volumes:
36-
- mysql_data:/var/lib/mysql
37-
environment:
38-
MYSQL_DATABASE: $W9_ID
39-
MYSQL_USER: $W9_ID
40-
MYSQL_PASSWORD: $W9_POWER_PASSWORD
41-
MYSQL_ROOT_PASSWORD: $W9_POWER_PASSWORD
14+
- dashy:/app/user-data/
15+
healthcheck:
16+
test: ['CMD', 'node', '/app/services/healthcheck']
17+
interval: 1m30s
18+
timeout: 10s
19+
retries: 3
20+
start_period: 40s
4221

4322
volumes:
44-
wordpress:
45-
mysql_data:
23+
dashy:
4624

4725
networks:
4826
default:

apps/dashy/src/after_up.sh

Lines changed: 0 additions & 1 deletion
This file was deleted.

apps/dashy/src/encrypt.sh

Lines changed: 0 additions & 12 deletions
This file was deleted.

apps/dashy/src/filelist

Lines changed: 0 additions & 3 deletions
This file was deleted.

apps/dashy/src/get_version.sh

Lines changed: 0 additions & 1 deletion
This file was deleted.

apps/dashy/src/nginx-proxy.conf.template

Lines changed: 0 additions & 57 deletions
This file was deleted.

0 commit comments

Comments
 (0)