Skip to content
Snippets Groups Projects
Commit e7d789df authored by jurgenhaas's avatar jurgenhaas
Browse files

Merge branch 'develop' into feature/macos

parents a44b8434 09dce9b8
No related branches found
No related tags found
1 merge request!1Feature/macos
v1.17.5 2021-01-04
------------------
docker/l3d#44 Update readme for requirements
docker/l3d#71 Output recommendation to run l3d reset at the end of selfupdate
docker/l3d#70 Add a list command
v1.17.4 2021-01-04
------------------
#69 Fix selfupdate to grab the correct latest tag
v1.17.3 2020-12-30
------------------
docker/l3d#61 Mount traefik config directory into l3drun and kill the traefik container before removing network
v1.17.2 2020-12-30
------------------
docker/l3d#61 Add docker-compose to the image
v1.17.1 2020-12-30
------------------
docker/l3d#61 Add a delete command to remove a project's containers and network
v1.17.0 2020-12-29
------------------
composer/plugin/docker4drupal#39 Add support for PHP 8.0
......
......@@ -6,6 +6,12 @@ Provides fully configured Docker images for local Drupal development where your
Nothing else than docker being installed on your host. You don't need any other tool - none!
Please refer to the [official Docker documentation](https://docs.docker.com/get-docker/) to quickly find out how to install docker on your platform.
Depending on your system setup you may also want to add your own user to the group `docker` afterwards.
If your IDE doesn't come with integrated Git support, you may also have to install tools like [Git](https://git-scm.com/downloads), [Git Flow](https://github.com/nvie/gitflow/wiki/Installation) or [Git LFS](https://git-lfs.github.com) - but all that depends on your specific needs. Usually all you need can be found inside of the L3D containers and you don't have to install any other tool on your host at all.
## Quick start Linux
You can install the tool with the following command:
......
......@@ -6,5 +6,5 @@ echo ""
echo "Version: ${VERSION}"
echo "Support: https://gitlab.lakedrops.com/docker/l3d"
echo ""
echo "Usage: l3d [ help | version | selfupdate [VERSION] | update | reset | PROJECTNAME | delete PROJECTNAME ]"
echo "Usage: l3d [ help | version | selfupdate [VERSION] | update | reset | PROJECTNAME | delete PROJECTNAME ] | list"
echo ""
#!/bin/bash
function listprojects() {
echo ""
docker container ls --all -q -f name=_l3d$ > /tmp/l3d.lst
IDS=$(cat /tmp/l3d.lst)
if [[ ! -n ${IDS} ]]; then
echo "No active L3D projects found."
return
fi
echo "Active L3D projects:"
echo "===================="
echo ""
for CONTAINERID in `cat /tmp/l3d.lst`; do
docker inspect $CONTAINERID | jq -r .[0].Config.Hostname | cut -d'-' -f 1
done
rm /tmp/l3d.lst
}
function listnetworks() {
echo ""
docker network ls -q -f name=^traefik_ > /tmp/l3d.lst
IDS=$(cat /tmp/l3d.lst)
if [[ ! -n ${IDS} ]]; then
echo "No active L3D networks found."
return
fi
echo "Active L3D networks:"
echo "===================="
echo ""
for NETWORKID in `cat /tmp/l3d.lst`; do
docker inspect $NETWORKID | jq -r .[0].Name | cut -d'_' -f 2
done
rm /tmp/l3d.lst
}
listprojects
listnetworks
......@@ -3,7 +3,7 @@
if [[ -n $1 ]]; then
NEWVERSION=$1
else
NEWVERSION=$(curl -s https://gitlab.lakedrops.com/api/v4/projects/282/repository/tags | jq -r .[0].name)
NEWVERSION=$(curl -s "https://gitlab.lakedrops.com/api/v4/projects/282/repository/tags?order_by=updated&search=^v" | jq -r .[0].name)
fi
if [[ "$NEWVERSION" == "$VERSION" ]]; then
......@@ -23,3 +23,14 @@ echo "Self update to version ${NEWVERSION} succeeded!"
export VERSION=${NEWVERSION}
export L3D_FORCE_UPDATE=0
/usr/local/bin/reset
echo ""
echo ""
echo ""
echo "================================================================"
echo "It's recommended to run"
echo ""
echo " l3d reset"
echo ""
echo "now, so that we can clean the legacy components properly."
echo "================================================================"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment