feat: 移动到分支目录

Author: rehiy

.github/workflows/docker-image.yml .github/workflows/latest.yml

@@ -1,4 +1,4 @@
-name: Docker Image CI
+name: Webox Latest Image CI
 
 on:
   push:
@@ -29,7 +29,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v4
         with:
-          context: .
+          context: ./latest
           push: true
           platforms: linux/amd64,linux/arm64,linux/arm
           tags: rehiy/webox:latest

README-zh.md

@@ -2,130 +2,36 @@
 
 让我们从 `AlpineLinux` 重新起航 !
 
-*Webox* 是 `web-box` 的缩写，意为建站盒子。这是一个自定义的 `LNMP` 集成化容器, 内置了以下常用模块 MariaDB、Nginx、PHP、Redis。
+*Webox* 是 `web-box` 的缩写，意为建站盒子。这是一个自定义的 `LNMP` 集成化容器, 预安装了一些常用模块，如 MariaDB、Nginx、PHP、Redis。
 
-- mariadb 10.6.x
+## 使用说明
 
-- nginx 1.22.x
+由于不同分支预安装了不同的组件，请选择分支后查看详细说明
 
-- php 8.1.x
+## 可用分支
 
-  - redis
+- [latest](https://github.com/rehiy/webox-docker/tree/master/latest): nginx + php8.1 + mariadb + redis
 
-- redis 7.0.x
+- [edge](https://github.com/rehiy/webox-docker/tree/master/edge): nginx + php8.2 + mariadb + redis
 
-# 可用分支
+- [edge-php7](https://github.com/rehiy/webox-docker/tree/master/edge-php7): nginx + php7.4 + mariadb + redis
 
-- [latest](https://github.com/rehiy/webox-docker/tree/master): nginx + php8.1 + mariadb + redis
+- [nginx](https://github.com/rehiy/webox-docker/tree/master/nginx)
 
-- [edge](https://github.com/rehiy/webox-docker/tree/edge): nginx + php8.2 + mariadb + redis
+- [nginx-geoip](https://github.com/rehiy/webox-docker/tree/master/nginx-geoip)
 
-- [edge-php7](https://github.com/rehiy/webox-docker/tree/edge): nginx + php7.4 + mariadb + redis
+- [nginx-php8.2](https://github.com/rehiy/webox-docker/tree/master/nginx-php8.2)
 
-- [nginx](https://github.com/rehiy/webox-docker/tree/nginx)
+- [nginx-php, nginx-php8, nginx-php8.1](https://github.com/rehiy/webox-docker/tree/master/nginx-php8.1)
 
-- [nginx-geoip](https://github.com/rehiy/webox-docker/tree/nginx-geoip)
+- [nginx-php8.0](https://github.com/rehiy/webox-docker/tree/master/nginx-php8.0)
 
-- [nginx-php8.2](https://github.com/rehiy/webox-docker/tree/nginx-php8.2)
+- [nginx-php7, nginx-php7.4](https://github.com/rehiy/webox-docker/tree/master/nginx-php7.4)
 
-- [nginx-php, nginx-php8, nginx-php8.1](https://github.com/rehiy/webox-docker/tree/nginx-php8.1)
+- [nginx-php7.3](https://github.com/rehiy/webox-docker/tree/master/nginx-php7.3)
 
-- [nginx-php8.0](https://github.com/rehiy/webox-docker/tree/nginx-php8.0)
+- [nginx-php5, nginx-php5.6](https://github.com/rehiy/webox-docker/tree/master/nginx-php5.6)
 
-- [nginx-php7, nginx-php7.4](https://github.com/rehiy/webox-docker/tree/nginx-php7.4)
-
-- [nginx-php7.3](https://github.com/rehiy/webox-docker/tree/nginx-php7.3)
-
-- [nginx-php5, nginx-php5.6](https://github.com/rehiy/webox-docker/tree/nginx-php5.6)
-
-# 快速启动
-
-## 网站将监听下列端口 `docker-ip:80`
-
-```shell
-docker run --name MYBOX -d -p 80:80 -p 443:443 \
-    -v /MY/htdoc:/var/www/default \
-    -v /MY/mysql:/var/lib/mysql \
-    rehiy/webox
-```
-
-## 把网站文件按照规则上传到指定目录
-
-如果网站域名是 `www.example.org`，文件需要上传到目录 `/MY/htdoc/org.example.www/`。
-
-# 设置自启动组件
-
-```shell
-docker run --name MYBOX -d -p 80:80 -p 443:443 \
-    -v /MY/htdoc:/var/www/default \
-    -v /MY/config:/var/config \
-    -e 'WBX_APPS=nginx php81' \
-    -e 'TZ=Asia/Shanghai' \
-    rehiy/webox
-```
-
-## 环境变量释义
-
-- `WBX_APPS`, 设置需要启动的服务
-
-- `TZ`, 设置容器时区
-
-## 管理服务
-
-```shell
-docker exec -it MYBOX wkit [start|stop|restart|reload]
-```
-
-## 增加一些 PHP 扩展
-
-```shell
-docker exec -it MYBOX apk add \
-    php81-pcntl php81-posix php81-saop \
-    php81-maxminddb php81-pecl-imagick
-```
-
-## 自定义组件配置
-
-请把配置文件放到目录 `/MY/config/*` ，这些文件将会覆盖容器内的配置目录 `/etc` ，并在重启容器后生效。
-
-- 配置 mariadb
-
-  - /MY/config/mysql/conf.d/\*
-
-- 配置 nginx
-
-  - /MY/config/nginx/host.d/\*
-
-- 配置 php81
-
-  - /MY/config/php81/conf.d/\*
-
-- 配置 redis
-
-  - /MY/config/redis/redis.conf
-
-- 配置自启动脚本
-
-  - /MY/config/rc.local
-  - /MY/config/local.d/\*
-  - /MY/config/local.d/s3-prewkit
-  - /MY/config/local.d/s5-wkit
-  - /MY/config/local.d/s6-postwkit
-
-# 重要提示
-
-## 不要忘记修改数据库密码
-
-```shell
-docker exec -it MYBOX mysqladmin -u root password abc345
-```
-
-你可能还需要执行下列语句，删除危险账号。
-
-```sql
-DROP USER 'mysql'@'localhost';
-```
-
-# 更多问题
+## 更多问题
 
 请查阅 <https://github.com/rehiy/webox-docker/issues>

README.md

@@ -2,130 +2,36 @@
 
 Re sail from alpine !
 
-*Webox* (`abbreviation for web-box`) is a customized LNMP server, which includes the following components: MariaDB, Nginx, PHP, Redis. And add some popular plug-ins.
+*Webox* is the abbreviation for `web-box`, which means building a website box. This is a custom `LNMP` integrated container that comes pre installed with some commonly used modules such as MariaDB, Nginx, PHP, and Redis.
 
-- mariadb 10.6.x
+## Instructions for use
 
-- nginx 1.22.x
+Due to different components pre installed on different branches, please select the branch and review the detailed instructions
 
-- php 8.1.x
+## Supported Tags
 
-  - redis
+- [latest](https://github.com/rehiy/webox-docker/tree/master/latest): nginx + php8.1 + mariadb + redis
 
-- redis 7.0.x
+- [edge](https://github.com/rehiy/webox-docker/tree/master/edge): nginx + php8.2 + mariadb + redis
 
-# Supported Tags
+- [edge-php7](https://github.com/rehiy/webox-docker/tree/master/edge): nginx + php7.4 + mariadb + redis
 
-- [latest](https://github.com/rehiy/webox-docker/tree/master): nginx + php8.1 + mariadb + redis
+- [nginx](https://github.com/rehiy/webox-docker/tree/master/nginx)
 
-- [edge](https://github.com/rehiy/webox-docker/tree/edge): nginx + php8.2 + mariadb + redis
+- [nginx-geoip](https://github.com/rehiy/webox-docker/tree/master/nginx-geoip)
 
-- [edge-php7](https://github.com/rehiy/webox-docker/tree/edge): nginx + php7.4 + mariadb + redis
+- [nginx-php8.2](https://github.com/rehiy/webox-docker/tree/master/nginx-php8.2)
 
-- [nginx](https://github.com/rehiy/webox-docker/tree/nginx)
+- [nginx-php, nginx-php8, nginx-php8.1](https://github.com/rehiy/webox-docker/tree/master/nginx-php8.1)
 
-- [nginx-geoip](https://github.com/rehiy/webox-docker/tree/nginx-geoip)
+- [nginx-php8.0](https://github.com/rehiy/webox-docker/tree/master/nginx-php8.0)
 
-- [nginx-php8.2](https://github.com/rehiy/webox-docker/tree/nginx-php8.2)
+- [nginx-php7, nginx-php7.4](https://github.com/rehiy/webox-docker/tree/master/nginx-php7.4)
 
-- [nginx-php, nginx-php8, nginx-php8.1](https://github.com/rehiy/webox-docker/tree/nginx-php8.1)
+- [nginx-php7.3](https://github.com/rehiy/webox-docker/tree/master/nginx-php7.3)
 
-- [nginx-php8.0](https://github.com/rehiy/webox-docker/tree/nginx-php8.0)
+- [nginx-php5, nginx-php5.6](https://github.com/rehiy/webox-docker/tree/master/nginx-php5.6)
 
-- [nginx-php7, nginx-php7.4](https://github.com/rehiy/webox-docker/tree/nginx-php7.4)
-
-- [nginx-php7.3](https://github.com/rehiy/webox-docker/tree/nginx-php7.3)
-
-- [nginx-php5, nginx-php5.6](https://github.com/rehiy/webox-docker/tree/nginx-php5.6)
-
-# Simple Usage
-
-## The nginx is listening on `docker-ip:80`
-
-```shell
-docker run --name MYBOX -d -p 80:80 -p 443:443 \
-    -v /MY/htdoc:/var/www/default \
-    -v /MY/mysql:/var/lib/mysql \
-    rehiy/webox
-```
-
-## Put your files to host's webroot
-
-If the domain is `www.example.org`, the webroot will be `/MY/htdoc/org.example.www/`.
-
-# Manual Control Services
-
-```shell
-docker run --name MYBOX -d -p 80:80 -p 443:443 \
-    -v /MY/htdoc:/var/www/default \
-    -v /MY/config:/var/config \
-    -e 'WBX_APPS=nginx php81' \
-    -e 'TZ=Asia/Shanghai' \
-    rehiy/webox
-```
-
-## ENV Variables
-
-- `WBX_APPS`, Set up automatically started services
-
-- `TZ`, Set the timezone
-
-## Service management command
-
-```shell
-docker exec -it MYBOX wkit [start|stop|restart|reload]
-```
-
-## Add some PHP extension modules
-
-```shell
-docker exec -it MYBOX apk add \
-    php81-pcntl php81-posix php81-saop \
-    php81-maxminddb php81-pecl-imagick
-```
-
-## Configure the components you need
-
-You can place additional config files in `/MY/config/*`, these files will be copied to `{MYBOX}/etc` and take effect on next restart.
-
-- Configure mariadb
-
-  - /MY/config/mysql/conf.d/\*
-
-- Configure virtual host
-
-  - /MY/config/nginx/host.d/\*
-
-- Configure php81
-
-  - /MY/config/php81/conf.d/\*
-
-- Configure redis
-
-  - /MY/config/redis/redis.conf
-
-- Scripts in the following locations will be run when `MYBOX` started:
-
-  - /MY/config/rc.local
-  - /MY/config/local.d/\*
-  - /MY/config/local.d/s3-prewkit
-  - /MY/config/local.d/s5-wkit
-  - /MY/config/local.d/s6-postwkit
-
-# Important Notice
-
-## Don't forget to change mysql password
-
-```shell
-docker exec -it MYBOX mysqladmin -u root password abc345
-```
-
-You may also need to execute the following SQL statements.
-
-```sql
-DROP USER 'mysql'@'localhost';
-```
-
-# More Issues
+## More Issues
 
 See <https://github.com/rehiy/webox-docker/issues> for more issues.

build.sh

@@ -1,13 +1,7 @@
 #!/bin/sh -ex
 #
 
-if [ ! -x /usr/bin/dos2unix ]; then
-    apt install -y dos2unix
-fi
-
-find initfs/ -type f -exec dos2unix {} \;
-
-#====================================================================#
+cd latest
 
 docker build -t dev/webox .
 sleep 3

debug.sh

@@ -5,8 +5,8 @@ LABEL version="15.2.0" \
 
 ENV WBX_APPS="mysql nginx php81 redis"
 
-ADD initfs /ifs
-RUN sh /ifs/deploy
+ADD deploy /tmp/deploy
+RUN sh /tmp/deploy
 
 ENTRYPOINT ["/sbin/init"]