Skip to content

Commit

Permalink
Merge pull request #13 from ytake/feature/php-upgraded
Browse files Browse the repository at this point in the history
box updated / removed couchbase register
  • Loading branch information
ytake authored May 28, 2018
2 parents ac7a095 + 30a4855 commit ba88b95
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 13 deletions.
17 changes: 13 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@ without requiring you to install PHP(7.0 ~ 7.2), a web server(Nginx or Apache),
and any other server software on your local machine.

php7 box:

```json
"require-dev": {
"ytake/gardening": "~1.0"
{
"require-dev": {
"ytake/gardening": "~1.0"
}
}
```

Expand All @@ -21,7 +24,7 @@ https://atlas.hashicorp.com/ytake
- Git
- PHP 7.x (remi repository)
- Apache (2.4.6)
- Nginx (1.12)
- Nginx (1.14)
- MySQL (5.7)
- Sqlite3
- PostgreSQL (10.1)
Expand All @@ -34,7 +37,7 @@ https://atlas.hashicorp.com/ytake
- MongoDB
- Java(1.8)
- fluentd
- Couchbase(4.5)
- Couchbase(5.1)
- beanstalkd(1.10)
- RabbitMQ(3.7.2)
- Apache Cassandra(3.11)
Expand All @@ -59,14 +62,17 @@ ctype
curl
date
dom
ds
event
exif
fileinfo
filter
ftp
gd
geoip
gettext
gmp
grpc
hash
iconv
igbinary
Expand All @@ -77,6 +83,7 @@ ldap
libsodium
libxml
mbstring
mcrypt
memcached
memprof
mongodb
Expand All @@ -98,6 +105,7 @@ phalcon
Phar
phpiredis
posix
protobuf
rdkafka
readline
redis
Expand All @@ -115,6 +123,7 @@ sqlsrv
ssh2
standard
Stomp
swoole
sysvmsg
sysvsem
sysvshm
Expand Down
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ appendScriptPath = confDir + "/append.sh"
aliasesPath = confDir + "/aliases"

require File.expand_path(File.dirname(__FILE__) + '/scripts/builder.rb')
Vagrant.require_version '>= 1.9.0'
Vagrant.require_version '>= 2.0.0'

Vagrant.configure(2) do |config|

Expand Down
7 changes: 1 addition & 6 deletions scripts/builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def Builder.configure(config, settings)

# Configure The Box From ytake/gardening https://atlas.hashicorp.com/ytake/boxes/gardening
config.vm.box = settings["box"] ||= "ytake/gardening"
config.vm.box_version = settings["version"] ||= ">= 1.0.0"
config.vm.box_version = settings["version"] ||= ">= 1.1.0"
config.vm.hostname = settings["hostname"] ||= "gardening"

# Configure A Private Network IP
Expand Down Expand Up @@ -267,11 +267,6 @@ def Builder.configure(config, settings)
end
end

# couchbase-server service register
config.vm.provision "shell" do |s|
s.path = scriptDir + "/couchbase-server-register.sh"
end

# Configure couchbase-server
if (settings.has_key?("couchbase") && settings["couchbase"])
# enable couchbase-server
Expand Down
4 changes: 2 additions & 2 deletions src/ConsoleApplication.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
/**
* ConsoleApplication.php
*/

namespace Ytake\Gardening;

use Symfony\Component\Console\Application;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;

Expand All @@ -19,7 +19,7 @@ class ConsoleApplication extends Application
private $name = "gardening";

/** @var float console application version */
private $version = '1.0.0';
private $version = '1.1.0';

/**
* ConsoleApplication constructor.
Expand Down

0 comments on commit ba88b95

Please sign in to comment.