|
@@ -170,6 +170,7 @@ QUEUE_HOST=beanstalkd
|
|
|
|
|
|
<ul>
|
|
|
<li>PhpMyAdmin</li>
|
|
|
+<li>Adminer</li>
|
|
|
<li>PgAdmin</li>
|
|
|
<li>ElasticSearch</li>
|
|
|
<li>Selenium</li>
|
|
@@ -261,7 +262,7 @@ QUEUE_HOST=beanstalkd
|
|
|
<ul>
|
|
|
<li><p>If you are not using Git yet for your project, you can use <code>git clone</code> instead of <code>git submodule</code>.</p></li>
|
|
|
|
|
|
-<li><p>Note 2: To keep track of your Laradock changes, between your projects and also keep Laradock updated. <a href="#keep-tracking-Laradock">Check this</a></p></li>
|
|
|
+<li><p>Note 2: To keep track of your Laradock changes, between your projects and also keep Laradock updated. <a href="http://laradock.io/documentation/#keep-track-of-your-laradock-changes">Check this</a></p></li>
|
|
|
</ul>
|
|
|
|
|
|
<p>Your folder structure should look like this:</p>
|
|
@@ -299,8 +300,9 @@ QUEUE_HOST=beanstalkd
|
|
|
|
|
|
<p><em>Or you can keep <code>default.conf</code> as it is, and create a separate config <code>my-site.conf</code> file for it.</em></p>
|
|
|
|
|
|
-<p><strong>In case of Apache:</strong> :P
|
|
|
-<br></p>
|
|
|
+<p><strong>In case of Apache:</strong> :P</p>
|
|
|
+
|
|
|
+<p><br></p>
|
|
|
|
|
|
<blockquote>
|
|
|
<p><strong>Now jump to the <a href="#Usage">Usage</a> section.</strong></p>
|
|
@@ -353,8 +355,8 @@ QUEUE_HOST=beanstalkd
|
|
|
<p>If you are using <strong>Docker Toolbox</strong> (VM), do one of the following:</p>
|
|
|
|
|
|
<ul>
|
|
|
-<li>Upgrade to Docker <a href="https://www.docker.com/products/docker">Native</a> for Mac/Windows (Recommended). Check out <a href="#upgrading-laradock">Upgrading Laradock</a></li>
|
|
|
-<li>Use Laradock v3.* (Visit the <code>Laradock-ToolBox</code> <a href="https://github.com/laradock/laradock/tree/Laradock-ToolBox">Branch</a>).</li>
|
|
|
+<li>Upgrade to Docker <a href="https://www.docker.com/products/docker">Native</a> for Mac/Windows (Recommended). Check out <a href="http://laradock.io/documentation/#upgrading-laradock">Upgrading Laradock</a></li>
|
|
|
+<li>Use Laradock v3.*. Visit the <a href="https://github.com/laradock/laradock/tree/LaraDock-ToolBox">LaraDock-ToolBox</a> branch. <em>(outdated)</em></li>
|
|
|
</ul>
|
|
|
|
|
|
<p><br></p>
|
|
@@ -384,7 +386,7 @@ QUEUE_HOST=beanstalkd
|
|
|
<p>You can select your own combination of containers form the list below:</p>
|
|
|
|
|
|
<blockquote>
|
|
|
-<p><code>nginx</code>, <code>hhvm</code>, <code>php-fpm</code>, <code>mysql</code>, <code>redis</code>, <code>postgres</code>, <code>mariadb</code>, <code>neo4j</code>, <code>mongo</code>, <code>apache2</code>, <code>caddy</code>, <code>memcached</code>, <code>beanstalkd</code>, <code>beanstalkd-console</code>, <code>rabbitmq</code>, <code>beanstalkd-console</code>, <code>workspace</code>, <code>phpmyadmin</code>, <code>aerospike</code>, <code>pgadmin</code>, <code>elasticsearch</code>, <code>rethinkdb</code>, <code>postgres-postgis</code>, <code>certbot</code>, <code>mailhog</code>, <code>minio</code> and more&hellip;!</p>
|
|
|
+<p><code>nginx</code>, <code>hhvm</code>, <code>php-fpm</code>, <code>mysql</code>, <code>redis</code>, <code>postgres</code>, <code>mariadb</code>, <code>neo4j</code>, <code>mongo</code>, <code>apache2</code>, <code>caddy</code>, <code>memcached</code>, <code>beanstalkd</code>, <code>beanstalkd-console</code>, <code>rabbitmq</code>, <code>beanstalkd-console</code>, <code>workspace</code>, <code>phpmyadmin</code>, <code>adminer</code>, <code>aerospike</code>, <code>pgadmin</code>, <code>elasticsearch</code>, <code>rethinkdb</code>, <code>postgres-postgis</code>, <code>certbot</code>, <code>mailhog</code>, <code>minio</code> and more&hellip;!</p>
|
|
|
</blockquote>
|
|
|
|
|
|
<p><em>(Please note that sometimes we forget to update the docs, so check the <code>docker-compose.yml</code> file to see an updated list of all available containers).</em></p>
|
|
@@ -1005,6 +1007,18 @@ docker-compose up -d mariadb phpmyadmin
|
|
|
|
|
|
<p>2 - Open your browser and visit the localhost on port <strong>8080</strong>: <code>http://localhost:8080</code></p>
|
|
|
|
|
|
+<p><br>
|
|
|
+<a name="Use-Adminer"></a></p>
|
|
|
+
|
|
|
+<h2 id="use-adminer">Use Adminer</h2>
|
|
|
+
|
|
|
+<p>1 - Run the Adminer Container (<code>adminer</code>) with the <code>docker-compose up</code> command. Example:</p>
|
|
|
+
|
|
|
+<pre><code class="language-bash">docker-compose up -d adminer
|
|
|
+</code></pre>
|
|
|
+
|
|
|
+<p>2 - Open your browser and visit the localhost on port <strong>8080</strong>: <code>http://localhost:8080</code></p>
|
|
|
+
|
|
|
<p><br>
|
|
|
<a name="Use-pgAdmin"></a></p>
|
|
|
|
|
@@ -1518,13 +1532,27 @@ e) set it to <code>true</code></p>
|
|
|
|
|
|
<h2 id="improve-speed-on-macos">Improve speed on MacOS</h2>
|
|
|
|
|
|
-<p>Sharing code into Docker containers with osxfs have very poor performance compared to Linux. You can get around this issue by using NFS to share your files betwen your host and your container.</p>
|
|
|
+<p>Sharing code into Docker containers with osxfs have very poor performance compared to Linux. Likely there are some workarounds:</p>
|
|
|
|
|
|
-<blockquote>
|
|
|
-<p>How to share files using NFS (d4m-nfs)</p>
|
|
|
-</blockquote>
|
|
|
+<h3 id="workaround-a-using-dinghy">Workaround A: using dinghy</h3>
|
|
|
+
|
|
|
+<p><a href="https://github.com/codekitchen/dinghy">Dinghy</a> creates its own VM using docker-machine, it will not modify your existing docker-machine VMs.</p>
|
|
|
|
|
|
-<p><a href="https://github.com/IFSight/d4m-nfs">d4m-nfs</a> automatically mount NFS volume instead of osxfs one.</p>
|
|
|
+<p>Quick Setup giude, (we recommend you check their docs)</p>
|
|
|
+
|
|
|
+<p>1) <code>brew tap codekitchen/dinghy</code></p>
|
|
|
+
|
|
|
+<p>2) <code>brew install dinghy</code></p>
|
|
|
+
|
|
|
+<p>3) <code>dinghy create --provider virtualbox</code> (must have virtualbox installed, but they support other providers if you prefer)</p>
|
|
|
+
|
|
|
+<p>4) after the above command is done it will display some env variables, copy them to the bash profile or zsh or.. (this will instruct docker to use the server running inside the VM)</p>
|
|
|
+
|
|
|
+<p>5) <code>docker-compose up ...</code></p>
|
|
|
+
|
|
|
+<h3 id="workaround-b-using-d4m-nfs">Workaround B: using d4m-nfs</h3>
|
|
|
+
|
|
|
+<p><a href="https://github.com/IFSight/d4m-nfs">D4m-nfs</a> automatically mount NFS volume instead of osxfs one.</p>
|
|
|
|
|
|
<p>1) Update the Docker [File Sharing] preferences:</p>
|
|
|
|
|
@@ -1544,17 +1572,26 @@ e) set it to <code>true</code></p>
|
|
|
|
|
|
<p>5) Create (or edit) the file <code>/etc/exports</code>, make sure it exists and is empty. (There may be collisions if you come from Vagrant or if you already executed the <code>d4m-nfs.sh</code> script before).</p>
|
|
|
|
|
|
-<p>6) Run the <code>d4m-nfs.sh</code> script:</p>
|
|
|
+<p>6) Run the <code>d4m-nfs.sh</code> script (might need Sudo):</p>
|
|
|
|
|
|
<pre><code class="language-bash">~/d4m-nfs/d4m-nfs.sh
|
|
|
</code></pre>
|
|
|
|
|
|
<p>That&rsquo;s it! Run your containers.. Example:</p>
|
|
|
|
|
|
-<pre><code class="language-bash">docker-compose up -d nginx mysql
|
|
|
+<pre><code class="language-bash">docker-compose up ...
|
|
|
</code></pre>
|
|
|
|
|
|
-<p><strong>Note:</strong> If you faced any errors, try restarting Docker, and make sure you have no spaces in the <code>d4m-nfs-mounts.txt</code> file, and your <code>/etc/exports</code> file is clear.</p>
|
|
|
+<p><em>Note: If you faced any errors, try restarting Docker, and make sure you have no spaces in the <code>d4m-nfs-mounts.txt</code> file, and your <code>/etc/exports</code> file is clear.</em></p>
|
|
|
+
|
|
|
+<h3 id="other-good-workarounds">Other good workarounds:</h3>
|
|
|
+
|
|
|
+<ul>
|
|
|
+<li><a href="https://github.com/EugenMayer/docker-sync">docker-sync</a></li>
|
|
|
+<li>Add more here..</li>
|
|
|
+</ul>
|
|
|
+
|
|
|
+<p>More details about this issue <a href="https://github.com/docker/for-mac/issues/77">here</a>.</p>
|
|
|
|
|
|
<p><br>
|
|
|
<a name="Common-Problems"></a></p>
|
|
@@ -1705,12 +1742,13 @@ features, by not reporting duplicate issues.</em></p>
|
|
|
<li>Install <a href="https://gohugo.io/">Hugo</a> on your machine (easy thing).</li>
|
|
|
<li>Open the <code>DOCUMENTATION/_settings/content</code> and search for the markdown file you want to edit (every folder represents a section in the menu).</li>
|
|
|
<li>Delete the <code>/docs</code> folder from the root.</li>
|
|
|
-<li>When you finish editing, run the <code>hugo</code> command to generate the HTML docs (in the <code>/docs</code>).</li>
|
|
|
+<li>When you finish editing, go to <code>DOCUMENTATION/_settings/</code> and run the <code>hugo</code> command to generate the HTML docs (inside new <code>/docs</code> folder).</li>
|
|
|
</ol>
|
|
|
|
|
|
<h3 id="to-host-the-website-locally">To Host the website locally</h3>
|
|
|
|
|
|
<p>Go to <code>DOCUMENTATION/_settings</code> in your terminal and run <code>hugo serve</code> to host the website locally.</p>
|
|
|
+
|
|
|
<h3 id="edit-the-sidebar">Edit the sidebar</h3>
|
|
|
|
|
|
<p>To add a new section to the sidebar or edit existing one, you need to edit this file <code>DOCUMENTATION/_settings/config.toml</code>.</p>
|