diff --git a/Dockerfile b/Dockerfile index ebab6e1..8d9391b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM node:lts-slim AS base -RUN npm install -g holesail@2.2.0 +RUN npm install -g holesail@1.10.1 FROM base AS dev diff --git a/README.md b/README.md index 734406b..06546c0 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ The following environment variables are available: - HOST: The hostname or IP address to use for the client or server mode. - PUBLIC: A boolean value indicating whether the server should use a public connetor string. Only applicable in server mode. - FORCE: A boolean value indicating whether to force a short connector string of less than 32 chars. Only applicable in server and filemanager modes. -- CONNECTOR: A connector string used to identify the connection. Can be used in client, server, and filemanager modes. +- KEY: A string used to identify the connection. Can be used in client, server, and filemanager modes. - USERNAME: The username to use for authentication in filemanager mode. - PASSWORD: The password to use for authentication in filemanager mode. - ROLE: The role to assign to the user in filemanager mode. Can be either admin or user. @@ -41,7 +41,7 @@ docker run -d --name holesail \ -e MODE=server \ -e PORT=25565 \ -e HOST=minecraft \ - -e CONNECTOR=very-super-secret \ + -e KEY=very-super-secret \ -e PUBLIC=false \ --network holesail \ anaxios/holesail:latest @@ -66,7 +66,7 @@ services: PORT: 25565 HOST: minecraft PUBLIC: false - CONNECTOR: very-super-secret + KEY: very-super-secret networks: - holesail @@ -101,18 +101,17 @@ services: holesail: container_name: holesail restart: unless-stopped - network_mode: "host" + ports: + - 8989:8989 image: anaxios/holesail:latest environment: MODE: client PORT: 8989 HOST: 0.0.0.0 PUBLIC: false - CONNECTOR: very-super-secret + KEY: very-super-secret ``` -**Note:** Client mode only works on Linux, and is incompatible with Windows and Mac. - ### Filemanager Mode In Filemanager mode, Holesail-docker serves a file manager interface. Example `docker-compose.yml` file: @@ -131,7 +130,7 @@ services: ROLE: user USERNAME: admin PASSWORD: admin - CONNECTOR: very-super-secret + KEY: very-super-secret volumes: - :/data ``` @@ -153,7 +152,7 @@ services: PORT: 25565 HOST: minecraft PUBLIC: false - CONNECTOR: very-super-secret + KEY: very-super-secret networks: - holesail diff --git a/run.sh b/run.sh index fd807cd..1a04665 100644 --- a/run.sh +++ b/run.sh @@ -25,9 +25,9 @@ success() { print "$GREEN" "$1" } -get_connector_my_mc() { - KEY="$(/usr/local/bin/node /fetch-my-mc-connector.js)" -} +#get_connector_my_mc() { +# KEY="$(/usr/local/bin/node /fetch-my-mc-connector.js)" +#} cmd_argument_builder () { local args=""; @@ -36,7 +36,7 @@ cmd_argument_builder () { [[ "$PORT" ]] && args="$args --port $PORT"; [[ "$HOST" ]] && args="$args --host $HOST"; [[ "$KEY" ]] && args="$args $KEY"; - [[ "$UDP" = "true" ]] && args="$args --udp"; + #[[ "$UDP" = "true" ]] && args="$args --udp"; ;; "server") [[ "$PORT" ]] && args="$args --live $PORT"; @@ -44,7 +44,7 @@ cmd_argument_builder () { [[ "$PUBLIC" = "true" ]] && args="$args --public"; [[ "$FORCE" = "true" ]] && args="$args --force"; [[ "$KEY" ]] && args="$args --key $KEY"; - [[ "$UDP" = "true" ]] && args="$args --udp"; + #[[ "$UDP" = "true" ]] && args="$args --udp"; ;; "filemanager") args="--filemanager"; @@ -56,14 +56,14 @@ cmd_argument_builder () { [[ "$ROLE" = "admin" ]] && args="$args --role admin"; [[ "$ROLE" = "user" ]] && args="$args --role user"; [[ "$KEY" ]] && args="$args --key $KEY"; - [[ "$UDP" = "true" ]] && args="$args --udp"; + #[[ "$UDP" = "true" ]] && args="$args --udp"; ;; "my-mc") - if ! get_connector_my_mc; then exit 1; fi + #if ! get_connector_my_mc; then exit 1; fi [[ "$PORT" ]] && args="$args --port $PORT"; [[ "$HOST" ]] && args="$args --host $HOST"; [[ "$KEY" ]] && args="$args --connect $KEY"; - [[ "$UDP" = "true" ]] && args="$args --udp"; + #[[ "$UDP" = "true" ]] && args="$args --udp"; ;; esac