Skip to content

Commit

Permalink
Release 21.02
Browse files Browse the repository at this point in the history
  • Loading branch information
accetto committed Feb 24, 2021
1 parent 1640ab2 commit 56ad5e0
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 6 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@

***

### Release 21.02

- VNC password not enforced any more ([issue #6](https://github.com/accetto/ubuntu-vnc-xfce-g3/issues/6))
- it can be disabled by `run -e VNC_PW=""`
- readme files also updated

### Release 21.01

- **TigerVNC** switched from nightly builds (1.11.80) back to the latest release (1.11.0)
Expand Down
4 changes: 3 additions & 1 deletion docker/xfce-chromium/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@ The version sticker values are generated by the script `version_sticker.sh`, whi

There are two ways, how to use the created headless containers.

The default **VNC user** password is **headless** and it can be changed through the environment variable **VNC_PW**. For example the following container would use the password value **mynewpwd**:
The default **VNC user** password is **headless** and it can be changed through the environment variable **VNC_PW**. It can also be disabled by setting it to an empty string.

For example, the following container would use the password value **mynewpwd**:

```shell
docker run -d -P -e VNC_PW=mynewpwd accetto/ubuntu-vnc-xfce-chromium-g3
Expand Down
4 changes: 3 additions & 1 deletion docker/xfce-firefox/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,9 @@ The version sticker values are generated by the script `version_sticker.sh`, whi

There are two ways, how to use the created headless containers.

The default **VNC user** password is **headless** and it can be changed through the environment variable **VNC_PW**. For example the following container would use the password value **mynewpwd**:
The default **VNC user** password is **headless** and it can be changed through the environment variable **VNC_PW**. It can also be disabled by setting it to an empty string.

For example, the following container would use the password value **mynewpwd**:

```shell
docker run -d -P -e VNC_PW=mynewpwd accetto/ubuntu-vnc-xfce-firefox-g3
Expand Down
4 changes: 3 additions & 1 deletion docker/xfce/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,9 @@ The version sticker values are generated by the script `version_sticker.sh`, whi

There are two ways, how to use the created headless containers.

The default **VNC user** password is **headless** and it can be changed through the environment variable **VNC_PW**. For example the following container would use the password value **mynewpwd**:
The default **VNC user** password is **headless** and it can be changed through the environment variable **VNC_PW**. It can also be disabled by setting it to an empty string.

For example, the following container would use the password value **mynewpwd**:

```shell
docker run -d -P -e VNC_PW=mynewpwd accetto/ubuntu-vnc-xfce-g3
Expand Down
9 changes: 6 additions & 3 deletions docker/xfce/src/startup/vnc_startup.rc
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,17 @@ start_vnc () {
if [ -n "${_verbose}" ] ; then echo "WARNING: No 'vncserver' is available." ; fi
return 0
fi

### VNC requirements
### Since the issue #6 is the VNC password not enforced any more, so it can be set to an empty string
### by 'docker run -e VNC_PW=""'. If you still want to enforce it, bring the following line back:
### || [ -z "${VNC_PW}" ] \
if [ -z "${DISPLAY}" ] \
|| [ -z "${VNC_PORT}" ] \
|| [ -z "${VNC_PW}" ] \
|| [ -z "${VNC_COL_DEPTH}" ] \
|| [ -z "${VNC_RESOLUTION}" ] ; then
cleanup "ERROR: Not all required environment variables are set: DISPLAY, VNC_PORT,VNC_PW, VNC_COL_DEPTH, VNC_RESOLUTION"
# cleanup "ERROR: Not all required environment variables are set: DISPLAY, VNC_PORT, VNC_PW, VNC_COL_DEPTH, VNC_RESOLUTION"
cleanup "ERROR: Not all required environment variables are set: DISPLAY, VNC_PORT, VNC_COL_DEPTH, VNC_RESOLUTION"
fi

passwd_path="${HOME}"/.vnc/passwd
Expand Down

0 comments on commit 56ad5e0

Please sign in to comment.