Skip to content

Commit 1e20cc4

Browse files
committed
Rewrite deployment
1 parent a0b83db commit 1e20cc4

File tree

17 files changed

+4102
-2322
lines changed

17 files changed

+4102
-2322
lines changed

.gitignore

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
/*.nginx
99
/web/css/*
1010
/web/js/*
11+
/web/entrypoints.json
12+
/web/runtime*.js
1113
/web/manifest.json
1214

1315
###> symfony/framework-bundle ###
@@ -20,13 +22,6 @@
2022
###> symfony/web-server-bundle ###
2123
/.web-server-pid
2224
###< symfony/web-server-bundle ###
23-
24-
###> symfony/webpack-encore-pack ###
25-
/node_modules/
26-
npm-debug.log
27-
yarn-error.log
28-
###< symfony/webpack-encore-pack ###
29-
3025
###> symfony/phpunit-bridge ###
3126
.phpunit
3227
/phpunit.xml
@@ -36,3 +31,10 @@ yarn-error.log
3631
/.php_cs
3732
/.php_cs.cache
3833
###< friendsofphp/php-cs-fixer ###
34+
35+
###> symfony/webpack-encore-bundle ###
36+
/node_modules/
37+
/web/build/
38+
npm-debug.log
39+
yarn-error.log
40+
###< symfony/webpack-encore-bundle ###

Resources/doc/01-installation-dev.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Add repository for php 7.1:
5050
sudo sh -c 'echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'
5151

5252

53-
Install required php modules ``sudo apt-get update && sudo apt-get install -y php7.1 php7.1-cli php7.1-intl php7.1-xdebug php7.1-mysqlnd php7.1-xml php7.1-mbstring php7.1-zip php7.1-fpm`` Create and enable ``common.ini``:
53+
Install required php modules ``sudo apt-get update && sudo apt-get install -y php7.1 php7.1-cli php7.1-intl php7.1-xdebug php7.1-mysqlnd php7.1-xml php7.1-mbstring php7.1-zip php7.1-fpm php7.1-curl`` Create and enable ``common.ini``:
5454

5555
::
5656

bin/deploy-to-prod.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ $(phpenv version-name) = "7.1" ];
44
eval "$(ssh-agent -s)"
55
chmod 600 .travis/deploy.key
66
ssh-add .travis/deploy.key
7-
scp package.tgz $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH
8-
ssh $DEPLOY_USER@$DEPLOY_HOST $DEPLOY_PATH/deploy.sh
9-
ssh $DEPLOY_USER@$DEPLOY_HOST php\ ~/php.of.by/builds/current/bin/console\ doctrine:migrations:migrate\ --env=prod
7+
#scp package.tgz $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH
8+
#ssh $DEPLOY_USER@$DEPLOY_HOST $DEPLOY_PATH/deploy.sh
9+
#ssh $DEPLOY_USER@$DEPLOY_HOST php\ ~/php.of.by/builds/current/bin/console\ doctrine:migrations:migrate\ --env=prod
10+
vendor/bin/dep deploy production
1011
fi

composer.json

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,39 +19,41 @@
1919
],
2020
"require": {
2121
"php": "^7.1.3",
22+
"ext-ctype": "*",
2223
"ext-iconv": "*",
2324
"ext-pdo": "*",
2425
"ext-pdo_mysql": "*",
2526
"ext-zip": "*",
27+
"deployer/deployer": "6.3.*",
2628
"easycorp/easyadmin-bundle": "1.*",
2729
"friendsofsymfony/ckeditor-bundle": "1.*",
2830
"friendsofsymfony/user-bundle": "2.1.*",
2931
"owenversteeg/min": "dev-gh-pages#fe73afc9e1a0ae3492ad3af2efeb0f4d47f967cc",
3032
"pear/archive_tar": "1.4.*",
3133
"pear/pear-core-minimal": "1.*",
3234
"sensio/framework-extra-bundle": "^5.1",
33-
"sensiolabs/security-checker": "4.*",
35+
"sensiolabs/security-checker": "5.*",
3436
"stof/doctrine-extensions-bundle": "1.3.*",
35-
"symfony/asset": "^4.1",
36-
"symfony/console": "^4.1",
37-
"symfony/dotenv": "^4.1",
38-
"symfony/expression-language": "^4.1",
39-
"symfony/flex": "^1.0",
40-
"symfony/form": "^4.1",
41-
"symfony/framework-bundle": "^4.1",
42-
"symfony/lts": "^4@dev",
37+
"symfony/asset": "*",
38+
"symfony/console": "*",
39+
"symfony/dotenv": "*",
40+
"symfony/expression-language": "*",
41+
"symfony/flex": "^1.1",
42+
"symfony/form": "*",
43+
"symfony/framework-bundle": "*",
4344
"symfony/monolog-bundle": "^3.1",
4445
"symfony/orm-pack": "*",
45-
"symfony/process": "^4.1",
46+
"symfony/process": "*",
4647
"symfony/requirements-checker": "1.*",
47-
"symfony/security-bundle": "^4.1",
48+
"symfony/security-bundle": "*",
4849
"symfony/serializer-pack": "*",
4950
"symfony/swiftmailer-bundle": "^3.1",
50-
"symfony/twig-bundle": "^4.1",
51-
"symfony/validator": "^4.1",
52-
"symfony/web-link": "^4.1",
53-
"symfony/webpack-encore-pack": "*",
54-
"symfony/yaml": "^4.1"
51+
"symfony/translation": "*",
52+
"symfony/twig-bundle": "*",
53+
"symfony/validator": "*",
54+
"symfony/web-link": "*",
55+
"symfony/webpack-encore-bundle": "^1.0",
56+
"symfony/yaml": "*"
5557
},
5658
"require-dev": {
5759
"elao/web-profiler-extra-bundle": "2.*",
@@ -64,13 +66,13 @@
6466
"symfony/debug-pack": "*",
6567
"symfony/maker-bundle": "^1.0",
6668
"symfony/profiler-pack": "*",
67-
"symfony/test-pack": "^1.0",
68-
"symfony/web-server-bundle": "^4.1",
69+
"symfony/test-pack": "*",
70+
"symfony/web-server-bundle": "*",
6971
"vimeo/psalm": "2.*"
7072
},
7173
"config": {
7274
"platform": {
73-
"php": "7.1.18"
75+
"php": "7.1.23"
7476
},
7577
"preferred-install": {
7678
"*": "dist"
@@ -92,6 +94,8 @@
9294
}
9395
},
9496
"replace": {
97+
"paragonie/random_compat": "2.*",
98+
"symfony/polyfill-ctype": "*",
9599
"symfony/polyfill-iconv": "*",
96100
"symfony/polyfill-php71": "*",
97101
"symfony/polyfill-php70": "*",
@@ -116,7 +120,8 @@
116120
},
117121
"extra": {
118122
"symfony": {
119-
"allow-contrib": false
123+
"allow-contrib": false,
124+
"require": "4.1.*"
120125
},
121126
"public-dir": "web"
122127
}

0 commit comments

Comments
 (0)