Merge pull request #530 from khs1994-docker/dev

Support satis #479

.khsci.yml

@@ -0,0 +1,8 @@
+workspace:
+  base: /data/lnmp
+
+pipeline:
+  test:
+    image: khs1994/php-fpm:7.2.6-alpine3.7
+    command:
+      - ./lnmp-docker.sh

app/.gitignore

@@ -5,3 +5,4 @@
 !.env.*
 !my_second_app
 !my_other_app
+!satis-demo

app/satis-demo/README.md

@@ -0,0 +1,22 @@
+# Composer 私有化解决方案 Satis
+
+* 问题反馈 https://github.com/khs1994-docker/lnmp/issues/479
+
+* https://github.com/composer/satis
+
+* https://getcomposer.org/doc/articles/handling-private-packages-with-satis.md#satis
+
+## GitGub API 等的频率限制
+
+```bash
+Could not fetch https://api.github.com/repos/khs1994-docker/libdocker, please create a GitHub OAuth token to go over the API rate limit
+Head to https://github.com/settings/tokens/new?scopes=repo&description=Composer+on+7b6ead567709+2018-05-29+1134
+to retrieve a token. It will be stored in "/composer/auth.json" for future use by Composer.
+Token (hidden):
+```
+
+加上 `token` 解除限制
+
+* https://getcomposer.org/doc/articles/troubleshooting.md#api-rate-limit-and-oauth-tokens
+
+生成 `token` 之后，在提示处粘贴 `token` 回车即可。

app/satis-demo/satis.json

@@ -0,0 +1,23 @@
+{
+  "name": "My Composer",
+  "homepage": "http://packagist.example.com",
+  "repositories": [{
+      "type": "vcs",
+      "url": "https://github.com/khs1994-docker/libdocker"
+    },
+    {
+      "type": "vcs",
+      "url": "https://github.com/khs1994-docker/libregistry"
+    },
+    {
+      "type": "vcs",
+      "url": "https://github.com/khs1994-php/tencent-ai"
+    }
+  ],
+  "require-all": true,
+  "archive": {
+    "directory": "dist",
+    "format": "tar",
+    "skip-dev": false
+  }
+}

cli/completion/bash/lnmp-docker.sh

@@ -55,6 +55,7 @@ complete -W "acme.sh \
         restart \
         registry \
         registry-down \
+        satis \
         ssl \
         ssl-self \
         swarm-build \

cli/completion/fish/lnmp-docker.sh.fish

@@ -86,6 +86,7 @@ complete -c lnmp-docker.sh -n "__fish_use_subcommand" -f -a swarm-pull        -d
 complete -c lnmp-docker.sh -n "__fish_use_subcommand" -f -a swarm-push        -d     'Push Swarm mode LNMP images (nginx php7 etc)'
 complete -c lnmp-docker.sh -n "__fish_use_subcommand" -f -a swarm-update      -d     'Print update LNMP service example'
 complete -c lnmp-docker.sh -n "__fish_use_subcommand" -f -a systemd           -d     'Manage Docker LNMP by systemd(Only Support Linux x86_64)'
+complete -c lnmp-docker.sh -n "__fish_use_subcommand" -f -a satis             -d     'Build Satis'
 
 complete -c lnmp-docker.sh -n "__fish_use_subcommand" -f -a toolkit-docs      -d     'Up local docs Server'
 

lnmp-docker.ps1

@@ -124,6 +124,7 @@ Commands:
   init                 Init LNMP environment
   restore              Restore MySQL databases
   restart              Restart LNMP services
+  satis                Build Satis
   update               Upgrades LNMP
   upgrade              Upgrades LNMP
   update-version       Update LNMP soft to latest vesion
@@ -267,6 +268,15 @@ Function clusterkit_bash_cli($env, $service, $command){
         $command
 }
 
+Function satis(){
+  if(!(Test-Path app/satis)){
+    cp -Recurse app/satis-demo app/satis
+    Write-Warning "Please modify app/satis/satis.json"
+  }
+
+  docker run --rm -it -v $PWD/app/satis:/build -v lnmp_composer_cache-data:/composer composer/satis
+}
+
 # main
 
 env_status
@@ -372,6 +382,10 @@ switch($first){
 'Import ./config/nginx/ssl-self/root-ca.crt to Browsers,then set hosts in C:\Windows\System32\drivers\etc\hosts'
     }
 
+    satis {
+      satis
+    }
+
     httpd-cli {
       _bash_cli httpd sh
     }

lnmp-docker.sh

@@ -86,6 +86,7 @@ Commands:
   restart              Restart LNMP services
   registry             Start Docker Registry
   registry-down        Stop Docker Registry
+  satis                Build Satis
   update               Upgrades LNMP
   upgrade              Upgrades LNMP
   update-version       Update LNMP soft to latest vesion
@@ -226,6 +227,15 @@ When Docker for Desktop Start Kubernetes Success, you must remove this local ser
     "
 }
 
+_satis(){
+  if ! [ -d app/satis ];then
+    cp -r app/satis-demo app/satis
+    print_warning "Please modify app/satis/satis.json\n"
+  fi
+
+  docker run --rm -it -v $PWD/app/satis:/build -v lnmp_composer_cache-data:/composer composer/satis
+}
+
 _local_docs_server(){
   if ! [ -d app/khsdocs/k8s ];then
     git clone --depth=1 -b gh-pages [email protected]:khs1994-website/kubernetes-handbook.git app/khsdocs/k8s
@@ -1137,6 +1147,11 @@ For information please run $ docker service update --help
 "
   ;;
 
+  satis )
+    _satis
+
+  ;;
+
   build )
     run_docker
     init