Skip to content
Snippets Groups Projects
Commit 0b632384 authored by Jürgen Haas's avatar Jürgen Haas
Browse files

composer/plugin/docker4drupal#48 Adjust scripts for new traefik networking

parent 1369f18a
No related branches found
No related tags found
No related merge requests found
...@@ -15,18 +15,13 @@ function removecontainer() { ...@@ -15,18 +15,13 @@ function removecontainer() {
} }
function removenetwork() { function removenetwork() {
ID=$(docker network ls -q -f name=traefik_${PROJECT}) ID=$(docker network ls -q -f name=${PROJECT}_default)
if [[ ! -n ${ID} ]]; then if [[ ! -n ${ID} ]]; then
echo "No network to be removed." echo "No network to be removed."
return return
fi fi
echo "Deleting network ..." echo "Deleting network ..."
cd ${HOME}/.traefik || return docker network rm ${PROJECT}_default
if [[ -f "docker-compose.yml" ]]; then
sed -i -e "/- ${PROJECT}$/d" docker-compose.yml
sed -i -e "/^ ${PROJECT}:$/{N;d;}" docker-compose.yml
NETWORKS="${NETWORKS} traefik_${PROJECT}"
fi
} }
function rebuildtraefik() { function rebuildtraefik() {
......
...@@ -18,7 +18,7 @@ function listprojects() { ...@@ -18,7 +18,7 @@ function listprojects() {
function listnetworks() { function listnetworks() {
echo "" echo ""
docker network ls -q -f name=^traefik_ > /tmp/l3d.lst docker network ls -q -f name=_default$ > /tmp/l3d.lst
IDS=$(cat /tmp/l3d.lst) IDS=$(cat /tmp/l3d.lst)
if [[ ! -n ${IDS} ]]; then if [[ ! -n ${IDS} ]]; then
echo "No active L3D networks found." echo "No active L3D networks found."
......
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