diff --git a/docker/w9appmanage/docker-compose.yml b/docker/w9appmanage/docker-compose.yml index 42aae5de..56aa97d2 100644 --- a/docker/w9appmanage/docker-compose.yml +++ b/docker/w9appmanage/docker-compose.yml @@ -10,8 +10,6 @@ services: volumes: - logs:/usr/src/app/logs entrypoint: bash -c "/cmd.sh" - ports: - - ${APP_HTTP_PORT}:5000 networks: default: diff --git a/docker/w9nginxproxymanager/docker-compose.yml b/docker/w9nginxproxymanager/docker-compose.yml index a3174b55..55705c5c 100644 --- a/docker/w9nginxproxymanager/docker-compose.yml +++ b/docker/w9nginxproxymanager/docker-compose.yml @@ -10,7 +10,6 @@ services: container_name: ${APP_NAME} ports: - "80:80" - - "${APP_HTTP_PORT}:81" - "443:443" volumes: - nginx_data:/data diff --git a/docker/w9portainer/docker-compose.yml b/docker/w9portainer/docker-compose.yml index 3c578534..0c15ac48 100644 --- a/docker/w9portainer/docker-compose.yml +++ b/docker/w9portainer/docker-compose.yml @@ -6,8 +6,6 @@ services: container_name: ${APP_NAME} restart: unless-stopped env_file: .env - ports: - - ${APP_HTTP_PORT}:9000 volumes: - portainer:/data - /var/run/docker.sock:/var/run/docker.sock @@ -18,4 +16,4 @@ networks: external: true volumes: - portainer: \ No newline at end of file + portainer: diff --git a/install/install.sh b/install/install.sh index 5c01968c..20797334 100644 --- a/install/install.sh +++ b/install/install.sh @@ -486,11 +486,11 @@ echo "Install nginxproxymanager ..." cd /data/apps/w9services/w9nginxproxymanager && sudo docker compose up -d sleep 25 echo "edit nginxproxymanager password..." -login_data=$(curl -X POST -H "Content-Type: application/json" -d '{"identity":"admin@example.com","scope":"user", "secret":"changeme"}' http://$nginx_ip:81/api/tokens) -sleep 3 nginx_ip=$(docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' websoft9-nginxproxymanager) +login_data=$(curl -X POST -H "Content-Type: application/json" -d '{"identity":"admin@example.com","scope":"user", "secret":"changeme"}' http://$nginx_ip:81/api/tokens) #token=$(echo $login_data | grep -Po '(?<="token":")[^"]*') token=$(echo $login_data | jq -r '.token') +echo "Nginx token:"$token new_password=$(docker run --name pwgen backplane/pwgen 15)! docker rm -f pwgen echo "Nginx init password:" $new_password