diff --git a/Dockerfile b/Dockerfile index 44155a4..92ccf0f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -138,7 +138,7 @@ USER coder WORKDIR /home/coder VOLUME ["/home/coder"] -EXPOSE 8080 +EXPOSE 80 ENTRYPOINT ["/usr/bin/dumb-init", "--"] CMD ["supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"] diff --git a/README.es.md b/README.es.md index 6fafb61..a32791c 100644 --- a/README.es.md +++ b/README.es.md @@ -36,7 +36,7 @@ docker run --rm -it \ --privileged \ -v kiro-server-home:/home/coder \ --env-file .env \ - -p 8080:8080 \ + -p 8080:80 \ kiro-server-dind ``` @@ -50,7 +50,7 @@ Todo el trabajo se guarda en `/home/coder`, montado mediante el volumen `kiro-se ## Acceso -Una vez corriendo, visita: [http://localhost:8080](http://localhost:8080) +Una vez corriendo, visita: [http://localhost:80](http://localhost:80) Inicia sesión con las credenciales de tu archivo `.env`. ## Herramientas Incluidas diff --git a/README.md b/README.md index b5c2c6b..9e80b6a 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ docker run --rm -it \ --privileged \ -v kiro-server-home:/home/coder \ --env-file .env \ - -p 8080:8080 \ + -p 8080:80 \ kiro-server-dind ``` @@ -50,7 +50,7 @@ All work is persisted in `/home/coder`, mounted via Docker volume `kiro-server-h ## Access -Once running, visit: [http://localhost:8080](http://localhost:8080) +Once running, visit: [http://localhost:80](http://localhost:80) Login using the credentials defined in `.env`. ## Tooling Included diff --git a/desktop-wrapper.sh b/desktop-wrapper.sh index 621c7ce..8e9b83c 100644 --- a/desktop-wrapper.sh +++ b/desktop-wrapper.sh @@ -45,9 +45,5 @@ echo "[desktop-wrapper] Starting x11vnc..." x11vnc -display :1 $VNC_AUTH -forever -rfbport 5900 & sleep 1 -# NoVNC -echo "[desktop-wrapper] Starting noVNC..." -websockify --web=/usr/share/novnc/ 0.0.0.0:8080 localhost:5900 & - # Queue of processes to wait for wait -n diff --git a/docker-compose.yml b/docker-compose.yml index 673f673..169bc5e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ services: container_name: kiro-server privileged: true ports: - - "8080:8080" + - "8080:80" env_file: - .env volumes: diff --git a/supervisord.conf b/supervisord.conf index ec9007f..1ddc554 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -6,3 +6,9 @@ command=/usr/local/bin/desktop-wrapper.sh autorestart=true user=coder priority=10 + +[program:websockify] +command=/usr/bin/websockify --web=/usr/share/novnc/ 0.0.0.0:80 localhost:5900 +autorestart=true +user=coder +priority=20