Merge branch 'release/v1.10.1'

CHANGELOG

+v1.10.1 2019-12-27
+------------------
+
+Force rebuild to include Sodium support for PHP 7.2

Dockerfile

@@ -13,6 +13,7 @@ ENV LAKEDROPS_DEV_DC_OPTIONS " "
 
 ADD config.fish /etc/fish/
 ADD start.sh /usr/local/bin/.start
+ADD configIdea.sh /usr/local/bin/.configIdea
 
 RUN echo "Install dorgflow" && \
     cd /var/opt && \

configIdea.sh

+#!/bin/bash
+
+UUID=b88416e8-1762-45c7-ad93-82be4fbf72a4
+
+echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+<project version=\"4\">
+    <component name=\"RemoteMappingsManager\">
+        <list>
+            <list>
+                <remote-mappings server-id=\"php@${UUID}\" />
+            </list>
+        </list>
+    </component>
+</project>" > /drupal/.idea/remote-mappings.xml
+
+echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+<project version=\"4\">
+    <component name=\"PhpDockerContainerSettings\">
+        <list>
+            <map>
+                <entry key=\"${UUID}\">
+                    <value>
+                        <DockerContainerSettings>
+                            <option name=\"envVars\">
+                                <list>
+                                    <DockerEnvVarImpl>
+                                        <option name=\"name\"
+                                                value=\"COMPOSE_PROJECT_NAME\"/>
+                                        <option name=\"value\" value=\"${COMPOSE_PROJECT_NAME}\"/>
+                                    </DockerEnvVarImpl>
+                                    <DockerEnvVarImpl>
+                                        <option name=\"name\"
+                                                value=\"PHP_VERSION\"/>
+                                        <option name=\"value\" value=\"${PHP_VERSION}\"/>
+                                    </DockerEnvVarImpl>
+                                    <DockerEnvVarImpl>
+                                        <option name=\"name\"
+                                                value=\"SSH_AUTH_SOCK\"/>
+                                        <option name=\"value\"
+                                                value=\"/ssh-agent\"/>
+                                    </DockerEnvVarImpl>
+                                </list>
+                            </option>
+                            <option name=\"version\" value=\"1\"/>
+                            <option name=\"volumeBindings\">
+                                <list>
+                                    <DockerVolumeBindingImpl>
+                                        <option name=\"containerPath\"
+                                                value=\"/drupal\"/>
+                                        <option name=\"hostPath\"
+                                                value=\"${WORKDIR}\"/>
+                                    </DockerVolumeBindingImpl>
+                                    <DockerVolumeBindingImpl>
+                                        <option name=\"containerPath\"
+                                                value=\"/ssh-agent\"/>
+                                        <option name=\"hostPath\"
+                                                value=\"${SSHAUTH}\"/>
+                                    </DockerVolumeBindingImpl>
+                                    <DockerVolumeBindingImpl>
+                                        <option name=\"containerPath\"
+                                                value=\"/var/run/docker.sock\"/>
+                                        <option name=\"hostPath\"
+                                                value=\"/var/run/docker.sock\"/>
+                                    </DockerVolumeBindingImpl>
+                                    <DockerVolumeBindingImpl>
+                                        <option name=\"containerPath\"
+                                                value=\"/root/.traefik\"/>
+                                        <option name=\"hostPath\"
+                                                value=\"${HOMEDIR}/.traefik\"/>
+                                    </DockerVolumeBindingImpl>
+                                    <DockerVolumeBindingImpl>
+                                        <option name=\"containerPath\"
+                                                value=\"/root/.gitconfig\"/>
+                                        <option name=\"hostPath\"
+                                                value=\"${HOMEDIR}/.gitconfig\"/>
+                                    </DockerVolumeBindingImpl>
+                                    <DockerVolumeBindingImpl>
+                                        <option name=\"containerPath\"
+                                                value=\"/root/.composer/auth.json\"/>
+                                        <option name=\"hostPath\"
+                                                value=\"${HOMEDIR}/.composer/auth.json\"/>
+                                    </DockerVolumeBindingImpl>
+                                </list>
+                            </option>
+                        </DockerContainerSettings>
+                    </value>
+                </entry>
+            </map>
+        </list>
+    </component>
+</project>" > /drupal/.idea/php-docker-settings.xml

run/scripts/start

@@ -43,6 +43,9 @@ function startContainer {
         registry.lakedrops.com/docker/l3d/php-${PHP_VERSION}:${VERSION}
     fi
     docker exec -it \
+      --env HOMEDIR=${HOMEDIR} \
+      --env WORKDIR=${WORKDIR} \
+      --env SSHAUTH=${SSHAUTH} \
       ${COMPOSE_PROJECT_NAME}_l3d \
       /usr/local/bin/.start
   fi

setup/scripts/prepareMac4L3d

@@ -81,6 +81,7 @@ echo "Waiting ..."
 sleep 2
 SOCATID=$(docker container ls --all -q -f name=l3d_socat)
 if [[ -n ${SOCATID} ]]; then
+  ssh-add
   echo "All set!"
   exit 0
 fi

start.sh

@@ -71,14 +71,13 @@ function create {
       # Push to remote git repository
       if [[ -n ${L3D_GIT_REMOTE} ]]; then
         git remote add origin "$L3D_GIT_REMOTE"
-        git pull
-        git push
+        git push -u origin master
       fi
 
       # Cleanup
       if [[ $L3D_CLEANUP -eq 1 ]]; then
         docker-compose stop
-        docker-compose rm --force
+        docker-compose rm --force -v
       fi
     fi
   fi
@@ -164,6 +163,10 @@ if [[ -z "$EXISTING" ]]; then
   fi
 fi
 
+if [[ -d /drupal/.idea ]]; then
+  /usr/local/bin/.configIdea
+fi
+
 if [[ -x "${L3DSHELL}" ]]; then
   ${L3DSHELL}
 else