chore(dir): remove staging&testing

Author: zacksleo

.gitattributes

@@ -1,12 +1,9 @@
 * text=auto
 
-/tests export-ignore
 /.github export-ignore
 .gitattributes export-ignore
 .scrutinizer.yml export-ignore
 .styleci.yml export-ignore
-.codeclimate.yml export-ignore
 .travis.yml export-ignore
-phpunit.xml.dist export-ignore
-/README.md
-/README-cn.md
+/README.md export-ignore
+/README-cn.md export-ignore

.gitlab-ci.yml

@@ -204,50 +204,11 @@ production-image:
         - docker rmi $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
     only:
         - tags
-testing-server:
-    stage: deploy
-    variables:
-        DEPLOY_SERVER: "$TESTING_SERVER"
-    dependencies: []
-    cache: {}
-    script:
-        - cd deploy/testing
-        - rsync -rtvhze ssh . root@$DEPLOY_SERVER:/data/$CI_PROJECT_NAME --stats
-        - CHOWN_DIR="frontend/runtime frontend/web/assets frontend/web/uploads backend/runtime backend/web/assets backend/rbac console/runtime api/runtime api/web/assets"
-        - ssh root@$DEPLOY_SERVER "docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY"
-        - ssh root@$DEPLOY_SERVER "export COMPOSE_HTTP_TIMEOUT=120 && export DOCKER_CLIENT_TIMEOUT=120 && export TAG=$CI_COMMIT_TAG && cd /data/$CI_PROJECT_NAME && docker-compose pull web && docker-compose stop && docker-compose rm -f && docker-compose up -d --build"
-        - ssh root@$DEPLOY_SERVER "docker exec -i $CI_PROJECT_NAME chown www-data:www-data $CHOWN_DIR"
-        - ssh root@$DEPLOY_SERVER "docker exec -i $CI_PROJECT_NAME ./yii migrate/up --interactive=0"
-    only:
-        - develop
-    environment:
-        name: testing
-        url: http://$DEPLOY_SERVER
-    when: manual
-staging-server:
-    stage: deploy
-    variables:
-        DEPLOY_SERVER: "$STAGING_SERVER"
-    dependencies: []
-    cache: {}
-    script:
-        - cd deploy/staging
-        - rsync -rtvhze ssh . root@$DEPLOY_SERVER:/data/$CI_PROJECT_NAME --stats
-        - CHOWN_DIR="frontend/runtime frontend/web/assets frontend/web/uploads backend/runtime backend/web/assets backend/rbac console/runtime api/runtime api/web/assets"
-        - ssh root@$DEPLOY_SERVER "docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY"
-        - ssh root@$DEPLOY_SERVER "export COMPOSE_HTTP_TIMEOUT=120 && export DOCKER_CLIENT_TIMEOUT=120 && export TAG=$CI_COMMIT_TAG && cd /data/$CI_PROJECT_NAME && docker-compose pull web && docker-compose stop && docker-compose rm -f && docker-compose up -d --build"
-        - ssh root@$DEPLOY_SERVER "docker exec -i $CI_PROJECT_NAME chown www-data:www-data $CHOWN_DIR"
-        - ssh root@$DEPLOY_SERVER "docker exec -i $CI_PROJECT_NAME ./yii migrate/up --interactive=0"
-    only:
-        - master
-    environment:
-        name: staging
-        url: http://$DEPLOY_SERVER
 production-server:
     stage: deploy
     image: alpine
     variables:
-        DEPLOY_SERVER: "$STAGING_SERVER"
+        DEPLOY_SERVER: "$PRODUCTION_SERVER"
     dependencies: []
     script:
         - cd deploy/production

deploy/development/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

deploy/production/docker-compose.yml

@@ -14,36 +14,21 @@ services:
             - ./data/frontend/runtime:/var/www/html/frontend/runtime
             - ./data/frontend/web/assets:/var/www/html/frontend/web/assets
             - ./data/frontend/web/uploads:/var/www/html/frontend/web/uploads
-        links:
-            - mysql
         environment:
             ENABLE_ENV_FILE: 1
             ENABLE_LOCALCONF: 1
             API_TOKEN: "47591fb1175145933b20f80d89c9da0381e9339a"
         expose:
             - 9000
+        restart: always
 
     nginx:
-        build: ./services/nginx
+        image: zacksleo/nginx:yii2
         ports:
-            - "443:443"
+            - "80:80"
         links:
             - web
         volumes_from:
             - web
-
-    mysql:
-        image: mysql:5.6
-        expose:
-            - "3306"
-        environment:
-            MYSQL_ROOT_PASSWORD: root
-            MYSQL_DATABASE: web
-            MYSQL_USER: web
-            MYSQL_PASSWORD: web
-        volumes:
-            - ./data/mysql:/var/lib/mysql
-            - ./services/mysql/mysql.cfg:/etc/mysql/conf.d/mysql.cfg
-        # Autostart at boottime
-        #restart: always
+        restart: always