Skip to content

Commit

Permalink
update compass
Browse files Browse the repository at this point in the history
  • Loading branch information
chendelin1982 authored Dec 26, 2023
1 parent c7a52e6 commit c9b00da
Show file tree
Hide file tree
Showing 13 changed files with 25 additions and 62 deletions.
2 changes: 1 addition & 1 deletion apps/mongocompass/.env
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
W9_POWER_PASSWORD=EGProfkuyL3ogd
W9_REPO=websoft9dev/mongocompass
W9_VERSION=v1.31
W9_VERSION=1.41.0

#### -- Not allowed to edit below environments when recreate app based on existing data -- ####
W9_ID=mongocompass
Expand Down
8 changes: 6 additions & 2 deletions apps/mongocompass/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
FROM kasmweb/desktop:1.10.0
FROM kasmweb/desktop:1.14.0
USER root

LABEL maintainer="[email protected]"
LABEL version="1.41.0"
LABEL description="Mongo Compass"

ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV $STARTUPDIR/install
ENV COMPASSVERSION=1.31.3
ENV COMPASSVERSION=1.41.0
WORKDIR $HOME


Expand Down
2 changes: 1 addition & 1 deletion apps/mongocompass/variables.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{
"dist": "community",
"version": [
"v1.31",
"1.41.0",
"latest"
]
}
Expand Down
2 changes: 1 addition & 1 deletion apps/mongodb/.env
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ W9_ID=mongodb
W9_DB_PORT=27017
W9_DB_PORT_SET=27017
W9_LOGIN_USER=root
W9_COMMAND="--wiredTigerCacheSizeGB 2 --config /etc/mongod.conf"
W9_LOGIN_PASSWORD=$W9_POWER_PASSWORD
W9_COMMAND="--wiredTigerCacheSizeGB 2 --config /etc/mongod.conf"
W9_NETWORK=websoft9
#### --------------------------------------------------------------------------------------- ####
1 change: 0 additions & 1 deletion apps/mongodb/src/after_up.sh

This file was deleted.

3 changes: 0 additions & 3 deletions apps/mongodb/src/filelist

This file was deleted.

3 changes: 2 additions & 1 deletion apps/moodle/.env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
W9_POWER_PASSWORD=uQ8E1wVTzG8SOk3!
W9_VERSION=4.2
W9_VERSION=latest
W9_DIST=community
W9_REPO=docker.io/bitnami/moodle

Expand All @@ -11,6 +11,7 @@ W9_URL=appname.example.com
W9_LOGIN_USER=admin
W9_LOGIN_PASSWORD=$W9_POWER_PASSWORD
W9_DB_EXPOSE="mariadb"
W9_MARIADB_VERSION="10.6"
W9_DIST=community
W9_NETWORK=websoft9
#### --------------------------------------------------------------------------------------- ####
Expand Down
2 changes: 1 addition & 1 deletion apps/moodle/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ services:
- mariadb

mariadb:
image: docker.io/bitnami/mariadb:10.6
image: docker.io/bitnami/mariadb:$W9_MARIADB_VERSION
container_name: ${W9_ID}-mariadb
restart: unless-stopped
environment:
Expand Down
2 changes: 1 addition & 1 deletion apps/moodle/variables.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"edition": [
{
"dist": "community",
"version": ["4.2","latest"]
"version": ["4.3","latest"]
}
],
"requirements": {
Expand Down
53 changes: 5 additions & 48 deletions apps/mysql/Notes.md
Original file line number Diff line number Diff line change
@@ -1,61 +1,18 @@
# MySQL

This application is based on Official image, and user can add:

### 关于容器和宿主机文件文件夹同步的调查

### 案例compose

```yml
# add this file
# default MySQL root password is 123456

version: '3.1'

services:

mysql:
image: mysql:5.7
container_name: mysql_5.7
restart: always
ports:
- 3305:3306
volumes:
- ./mysql_config/conf.d:/etc/mysql/conf.d
- ./mysql_data:/var/lib/mysql
- ./docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
environment:
MYSQL_ROOT_PASSWORD: 123456
```
### 结果
![image](https://user-images.githubusercontent.com/45913187/114135578-02438900-993c-11eb-99d2-e7e3307abd50.png)
### 概念理解
- 宿主机目录对应的物理储存地址被**容器**和宿主机操作系统同时管理。
- 宿主机目录可以看成一个硬盘被挂载在容器目录下
- 宿主机的目录和容器的目录可以看成两个指针指向同一个物理地址
- 非空容器目录为什么不行?数据卷的意义在于数据持久化,将应用数据分离,因此数据在宿主机,若容器目录非空,会造成逻辑冲突,也就是怎样去同步宿主机目录和容器目录,解决两边文件的差异。因此只能挂载在容器中的空目录下。
### tips
- 若挂载的是目录,容器目录要为空目录
- 若容器目录不存在,也可以挂载会自动创建
- volumes基本规则->**文件夹:文件夹;文件:文件
- extra configure file
- extra sql file

## FAQ

#### MySQL 容器为什么无法使用 172.0.0.1 这种访问方式?

暂时无法得知,可能与用户的所支持的主机名列表有关系

#### command 能带哪些参数?

运行下面的命令查询
```
docker run -it --rm mysql:tag --verbose --help
Expand Down
2 changes: 1 addition & 1 deletion apps/mysql/variables.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"edition": [
{
"dist": "community",
"version": ["8.1","8.0","5.7","5.6","5.5"]
"version": ["8.2","8.1","8.0","5.7","5.6","5.5","latest"]
}
],
"requirements": {
Expand Down
3 changes: 3 additions & 0 deletions apps/onlyofficedocs/src/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ services:

#### step1: copy createCA.sh to container
```
#
docker exec -it onlyofficedocs bash
#
wget -N https://raw.githubusercontent.com/Websoft9/docker-library/main/apps/onlyofficedocs/src/createCA.sh
docker cp createCA.sh onlyofficedocs:/var/www/onlyoffice/Data
```
Expand Down
4 changes: 3 additions & 1 deletion apps/onlyofficedocs/src/createCA.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@


mkdir /var/www/onlyoffice/Data/certs
cd /var/www/onlyoffice/Data/certs
openssl genrsa -out onlyoffice.key 2048
openssl req -new -newkey rsa:2048 -nodes -keyout onlyoffice.key -out onlyoffice.csr -subj "/C=US/ST=California/L=San Francisco/O=My Company Name/OU=IT Department/CN=www.example.com/[email protected]"
openssl x509 -req -days 365 -in onlyoffice.csr -signkey onlyoffice.key -out onlyoffice.crt
openssl dhparam -out dhparam.pem 2048
openssl dhparam -out dhparam.pem 2048

0 comments on commit c9b00da

Please sign in to comment.