Release v17.09-rc13

Release v17.09-rc13 (#26)

Author: khs1994

.env

@@ -1,4 +1,4 @@
-KHS1994_LNMP_DOCKER_VERSION=v17.09-rc12
+KHS1994_LNMP_DOCKER_VERSION=v17.09-rc13
 
 # Docker Compose VAR
 

Changelog.md

@@ -5,6 +5,12 @@ Changelog
 
 #### v17.12 rc1
 
+#### v17.09 rc13
+
+Bug fixes:
+* Fix `Dockerfile`
+* Fix `RabbitMQ` error
+
 #### v17.09 rc12
 
 Bug fixes:

README.cn.md

@@ -18,7 +18,7 @@
 
 * [Docker CE](https://github.com/docker/docker-ce) 17.09.0+
 
-* [Docker Composer](https://github.com/docker/compose) 1.16.1+
+* [Docker Compose](https://github.com/docker/compose) 1.16.1+
 
 # 快速上手
 

README.md

@@ -17,7 +17,7 @@ To use LNMP Docker,you need:
 
 * [Docker CE](https://github.com/docker/docker-ce) 17.09.0+
 
-* [Docker Composer](https://github.com/docker/compose) 1.16.1+
+* [Docker Compose](https://github.com/docker/compose) 1.16.1+
 
 # Quick Start
 

app/demo/.gitignore

@@ -1 +1,3 @@
-.idea
+.ide
+vendor
+composer.lock

app/demo/amqp_consumer.php

@@ -0,0 +1,86 @@
+<?php
+
+// from https://github.com/php-amqplib/php-amqplib demo
+
+include(__DIR__ . '/config.php');
+use PhpAmqpLib\Connection\AMQPStreamConnection;
+
+$exchange = 'router';
+$queue = 'msgs';
+$consumerTag = 'consumer';
+
+$connection = new AMQPStreamConnection(HOST, PORT, USER, PASS, VHOST);
+$channel = $connection->channel();
+
+/*
+    The following code is the same both in the consumer and the producer.
+    In this way we are sure we always have a queue to consume from and an
+        exchange where to publish messages.
+*/
+
+/*
+    name: $queue
+    passive: false
+    durable: true // the queue will survive server restarts
+    exclusive: false // the queue can be accessed in other channels
+    auto_delete: false //the queue won't be deleted once the channel is closed.
+*/
+$channel->queue_declare($queue, false, true, false, false);
+
+/*
+    name: $exchange
+    type: direct
+    passive: false
+    durable: true // the exchange will survive server restarts
+    auto_delete: false //the exchange won't be deleted once the channel is closed.
+*/
+
+$channel->exchange_declare($exchange, 'direct', false, true, false);
+
+$channel->queue_bind($queue, $exchange);
+
+/**
+ * @param \PhpAmqpLib\Message\AMQPMessage $message
+ */
+function process_message($message)
+{
+    echo "\n--------\n";
+    echo $message->body;
+    echo "\n--------\n";
+
+    $message->delivery_info['channel']->basic_ack($message->delivery_info['delivery_tag']);
+
+    // Send a message with the string "quit" to cancel the consumer.
+    if ($message->body === 'quit') {
+        $message->delivery_info['channel']->basic_cancel($message->delivery_info['consumer_tag']);
+    }
+}
+
+/*
+    queue: Queue from where to get the messages
+    consumer_tag: Consumer identifier
+    no_local: Don't receive messages published by this consumer.
+    no_ack: Tells the server if the consumer will acknowledge the messages.
+    exclusive: Request exclusive consumer access, meaning only this consumer can access the queue
+    nowait:
+    callback: A PHP Callback
+*/
+
+$channel->basic_consume($queue, $consumerTag, false, false, false, false, 'process_message');
+
+/**
+ * @param \PhpAmqpLib\Channel\AMQPChannel $channel
+ * @param \PhpAmqpLib\Connection\AbstractConnection $connection
+ */
+function shutdown($channel, $connection)
+{
+    $channel->close();
+    $connection->close();
+}
+
+register_shutdown_function('shutdown', $channel, $connection);
+
+// Loop as long as the channel has callbacks registered
+while (count($channel->callbacks)) {
+    $channel->wait();
+}

app/demo/amqp_publisher.php

@@ -0,0 +1,48 @@
+<?php
+
+// from https://github.com/php-amqplib/php-amqplib demo
+
+include(__DIR__ . '/config.php');
+
+use PhpAmqpLib\Connection\AMQPStreamConnection;
+use PhpAmqpLib\Message\AMQPMessage;
+
+$exchange = 'router';
+$queue = 'msgs';
+
+$connection = new AMQPStreamConnection(HOST, PORT, USER, PASS, VHOST);
+$channel = $connection->channel();
+
+/*
+    The following code is the same both in the consumer and the producer.
+    In this way we are sure we always have a queue to consume from and an
+        exchange where to publish messages.
+*/
+
+/*
+    name: $queue
+    passive: false
+    durable: true // the queue will survive server restarts
+    exclusive: false // the queue can be accessed in other channels
+    auto_delete: false //the queue won't be deleted once the channel is closed.
+*/
+$channel->queue_declare($queue, false, true, false, false);
+
+/*
+    name: $exchange
+    type: direct
+    passive: false
+    durable: true // the exchange will survive server restarts
+    auto_delete: false //the exchange won't be deleted once the channel is closed.
+*/
+
+$channel->exchange_declare($exchange, 'direct', false, true, false);
+
+$channel->queue_bind($queue, $exchange);
+
+$messageBody = implode(' ', array_slice($argv, 1));
+$message = new AMQPMessage($messageBody, array('content_type' => 'text/plain', 'delivery_mode' => AMQPMessage::DELIVERY_MODE_PERSISTENT));
+$channel->basic_publish($message, $exchange);
+
+$channel->close();
+$connection->close();

app/demo/composer.json

@@ -0,0 +1,5 @@
+{
+  "require": {
+      "php-amqplib/php-amqplib": "2.7.*"
+  }
+}

app/demo/config.php

@@ -0,0 +1,14 @@
+<?php
+
+// from https://github.com/php-amqplib/php-amqplib demo
+
+require_once __DIR__ . '/vendor/autoload.php';
+
+define('HOST', 'rabbitmq');
+define('PORT', 5672);
+define('USER', 'guest');
+define('PASS', 'guest');
+define('VHOST', '/');
+
+//If this is enabled you can see AMQP output on the CLI
+define('AMQP_DEBUG', true);

app/demo/rabbitmq.php

@@ -0,0 +1,4 @@
+<?php
+require_once __DIR__.'/vendor/autoload.php';
+use PhpAmqpLib\Connection\AMQPStreamConnection;
+use PhpAmqpLib\Message\AMQPMessage;