Update build script that create distribution zip. and README.

uzulla · Mar 7, 2021 · 0ef67ad · 0ef67ad
1 parent 6a934e1
commit 0ef67ad
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/dist_zip/Makefile b/dist_zip/Makefile
@@ -1,7 +1,7 @@
 .PHONY:
 build:
 	make clean
-	git clone --depth=1 --branch=main https://github.com/uzulla/fc2blog.git fc2blog
+	git clone --depth=1 --branch=`git branch --contains |cut -d " " -f 2` https://github.com/uzulla/fc2blog.git fc2blog
 	rm -rf fc2blog/.git
 	cd fc2blog && php ../../composer.phar install --no-dev --optimize-autoloader
 	cd fc2blog && zip -r ../fc2blog_dist_`git rev-parse --short HEAD`.zip app public

diff --git a/dist_zip/README.md b/dist_zip/README.md
@@ -2,11 +2,13 @@
 
 Create a ZIP file for distribute.
 
+The branch name to build will be same as `git branch --contains |cut -d " " -f 2` (So, same as your local checkout branch).
+
 ## IMPORTANT NOTICE
 
 The script will be make a zip that cloned from `https://github.com/uzulla/fc2blog` (not `fc2blog/blog`).
 
-This situation is temporary on the development. will be change to `fc2blog/blog`.
+> This setup is temporary. will be change to `fc2blog/blog` in future.
 
 ## build zip
 
@@ -24,16 +26,20 @@ that contain `app`, `public`, and `app/vendor/`(libraries that installed by the
 
 ```
 $ make test
-{some logs output}
+{some build progress...}
+{After a while, will startup bash in docker. you can check something or startup apache and mysql by /startup.sh}
+$ ./startup.sh
+{start up apache and mysql and some logs output}
 If you want exit. please exit or ctrl-D
 ==================================
+{You can open this url by local browser}
 http://172.17.0.2/admin/common/install
 ==================================
-{some logs output}
+{some apache logs output}
 root@2792c09097ef:/# exit
 ```
 
-> All data is not permanent. All data will be lost when exited.
+> All data is not permanent. All data will be lost when bash exited.
 
 ## clean