diff --git a/create.sh b/create.sh index ae44a4a..dc39fca 100755 --- a/create.sh +++ b/create.sh @@ -60,7 +60,7 @@ docker exec --user www-data $DOCKER_PREFIX-web /bin/sh -c " --path=/var/www/html \ --skip-email \ --title=$DOCKER_PREFIX \ - --url=$WP_URL"; + --url=https://$WP_URL"; echo "Installing WordPress $WP_THEME theme"; docker exec --user www-data $DOCKER_PREFIX-web /bin/sh -c " @@ -70,3 +70,4 @@ docker exec --user www-data $DOCKER_PREFIX-web /bin/sh -c " echo "Connect network to traefik"; docker network connect $DOCKER_PREFIX traefik; +docker-compose up -d adminer diff --git a/docker-compose.yml b/docker-compose.yml index 8655629..3d54d01 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,11 +7,12 @@ networks: services: adminer: container_name: ${DOCKER_PREFIX}-adminer + hostname: ${DOCKER_PREFIX}-adminer image: adminer:4.7.2-standalone labels: - traefik.enable=true - traefik.http.routers.${DOCKER_PREFIX}-adminer.entrypoints=https - - traefik.http.routers.${DOCKER_PREFIX}-adminer.rule=Host(`adminer.${DOCKER_PREFIX}.localhost`) + - traefik.http.routers.${DOCKER_PREFIX}-adminer.rule=Host(`${WP_URL}`) && PathPrefix(`/adminer/`) - traefik.http.routers.${DOCKER_PREFIX}-adminer.tls=true - traefik.http.services.${DOCKER_PREFIX}-adminer.loadbalancer.server.port=8080 db: @@ -32,7 +33,7 @@ services: labels: - traefik.enable=true - traefik.http.routers.${DOCKER_PREFIX}-web.entrypoints=https - - traefik.http.routers.${DOCKER_PREFIX}-web.rule=Host(`www.${DOCKER_PREFIX}.localhost`) + - traefik.http.routers.${DOCKER_PREFIX}-web.rule=Host(`${WP_URL}`) - traefik.http.routers.${DOCKER_PREFIX}-web.tls=true - traefik.http.services.${DOCKER_PREFIX}-web.loadbalancer.server.port=80 volumes: diff --git a/purge.sh b/purge.sh index 3d9ad24..1f4ac56 100755 --- a/purge.sh +++ b/purge.sh @@ -8,6 +8,7 @@ set +o allexport docker-compose stop docker network disconnect $DOCKER_PREFIX traefik docker network rm $DOCKER_PREFIX +docker rm $DOCKER_PREFIX-adminer docker rm $DOCKER_PREFIX-web docker rm $DOCKER_PREFIX-db docker volume rm $DOCKER_PREFIX-web