Merge pull request #1262 from jeff-h/issue-171

Fixes #353 and allows easier dev & prod environments
Merge pull request #1257 from nellonican/hotfix
2017-11-21 22:56:04 +02:00 · 2017-11-21 22:55:33 +02:00 · 2017-11-21 22:54:54 +02:00 · 2017-11-21 22:53:32 +02:00 · 2017-11-21 22:53:19 +02:00 · 2017-11-21 09:59:11 +13:00
6 changed files with 22 additions and 17 deletions
--- a/DOCUMENTATION/themes/hugo-material-docs/layouts/partials/header.html
+++ b/DOCUMENTATION/themes/hugo-material-docs/layouts/partials/header.html
@ -21,7 +21,6 @@
    <div class="button button-github" role="button" aria-label="GitHub">
        <a style="padding: 0px; font-size:40px" href="https://github.com/{{ . }}" title="@{{ . }} on GitHub" target="_blank" class="toggle-button icon icon-github"></a>
    </div>
-      <p style="font-size: 18px; padding: 8px">Github</p>
    {{ end }}
    
    <!-- TODO: disabled until Hugo supports the generation of a content index natively 
--- a/caddy/Dockerfile
+++ b/caddy/Dockerfile
@ -1,17 +1,15 @@
-FROM golang
+FROM zuohuadong/caddy:alpine
+

 MAINTAINER Huadong Zuo <admin@zuohuadong.cn>

-ARG plugins="git"
+ARG plugins="cors"

-## If you come frome china, please ues it.
+## ARG plugins="cors cgi cloudflare azure linode"

-# RUN echo "172.217.6.127 golang.org" >> /etc/hosts

-RUN go get github.com/abiosoft/caddyplug/caddyplug \
-    && caddyplug install-caddy \
-    && caddyplug install git
-RUN caddy --version
+RUN caddyplug install ${plugins}
+    

 EXPOSE 80 443 2015

--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@ -0,0 +1,9 @@
+version: "2"
+
+services:
+
+### Applications Code Container #############################
+
+    applications:
+      volumes:
+        - ${APPLICATION}:/var/www
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -6,8 +6,6 @@ services:

    applications:
      image: tianon/true
-      volumes:
-        - ${APPLICATION}:/var/www

 ### Workspace Utilities Container ###########################

--- a/6
+++ b/6
@ -2,6 +2,11 @@
 # General Setup
 ###########################################################

+### Docker compose files ###############################################################################################
+# Select which docker-compose files to include.
+
+COMPOSE_FILE=docker-compose.yml:docker-compose.dev.yml
+
 ### Application Path ###################################################################################################
 # Point to your code, will be available at `/var/www`.

@ -95,7 +100,6 @@ PHP_FPM_INSTALL_EXIF=false
 PHP_FPM_INSTALL_AEROSPIKE=false
 PHP_FPM_INSTALL_MYSQLI=false
 PHP_FPM_INSTALL_PGSQL=false
-PHP_FPM_INSTALL_POSTGRES=false
 PHP_FPM_INSTALL_TOKENIZER=false
 PHP_FPM_INSTALL_INTL=false
 PHP_FPM_INSTALL_GHOSTSCRIPT=false
--- a/workspace/Dockerfile-71
+++ b/workspace/Dockerfile-71
@ -54,9 +54,7 @@ ENV PUID ${PUID}
 ENV PGID ${PGID}

 RUN groupadd -g ${PGID} laradock && \
-    useradd -u ${PUID} -g laradock -m laradock && \
-    apt-get update -yqq && \
-    apt-get install -y python2.7
+    useradd -u ${PUID} -g laradock -m laradock

 #####################################
 # SOAP:
@ -686,8 +684,7 @@ RUN if [ ${INSTALL_DUSK_DEPS} = true ]; then \
 # Clean up
 USER root
 RUN apt-get clean && \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
-    npm config set python /usr/bin/python2.7
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

 # Set default work directory
 WORKDIR /var/www
Author	SHA1	Message	Date
Mahmoud Zalt	65a8bbc6a4	Merge pull request #1262 from jeff-h/issue-171 Fixes #353 and allows easier dev & prod environments	2017-11-21 22:56:04 +02:00
Mahmoud Zalt	7c1f3060bf	Merge pull request #1257 from nellonican/hotfix Remove python installation from Dockerfile-71	2017-11-21 22:55:33 +02:00
Mahmoud Zalt	45e1ecf3c0	Merge pull request #1256 from ricardoseriani/remove-the-github-paragraph-on-header Remove the github paragraph on header	2017-11-21 22:54:54 +02:00
Mahmoud Zalt	c6b1eb016d	Merge pull request #1255 from zuohuadong/patch-23 Remove useless...	2017-11-21 22:53:32 +02:00
Mahmoud Zalt	c5005f54f7	Merge pull request #1254 from zuohuadong/patch-22 add git & Chinese users friendly.	2017-11-21 22:53:19 +02:00
Jeff	cf5b1af31a	Fixes #353 and allows easier dev & prod environments by splitting dev-specific configuration into a separate docker-compose.	2017-11-21 09:59:11 +13:00
Thorvald Falkenburg	8dea201b68	Remove python installation from Dockerfile-71 Python can be installed by using the WORKSPACE_INSTALL_PYTHON variable in the .env file. Fixes #1238	2017-11-16 21:31:43 +01:00
Ricardo Seriani	50a3e24db8	Remove the github paragraph on header Remove the github paragraph on header, since it already has a link to github using aria to accessibility	2017-11-16 12:13:00 -02:00
huadong zuo	9835a20863	Remove useless... Remove useless...	2017-11-15 13:05:26 +08:00
huadong zuo	5bcb99dfb9	add git & Chinese users friendly. China can not access golang.org.	2017-11-15 13:00:57 +08:00