Prepare for release

.devcontainer/Dockerfile

@@ -1,10 +1,18 @@
 # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.148.1/containers/rust/.devcontainer/base.Dockerfile
 
-FROM mcr.microsoft.com/vscode/devcontainers/rust:0-1
+FROM mcr.microsoft.com/vscode/devcontainers/rust:1
 
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
      && apt-get -y install --no-install-recommends asciidoctor
 
 RUN rm /etc/localtime && ln -s /usr/share/zoneinfo/Europe/Berlin /etc/localtime
 
-RUN cargo install cargo-outdated cargo-cache
+RUN chown vscode: -R /usr/local/rustup /usr/local/cargo
+
+USER vscode
+
+RUN rustup default 1.51.0 \
+ && rustup component add clippy rust-src rustfmt
+
+RUN cargo install cargo-outdated cargo-cache \
+ && cargo cache -a

CHANGELOG.md

@@ -2,15 +2,15 @@
 
 This project follows [semantic versioning](http://semver.org).
 
-### UNRELEASED
+### v2.2.0 (2021-04-06)
 
 - [added] Service target file (thanks to mnhauke)
 - [added] Added interactive configuration wizard
 - [added] Support for (un-)installation
 - [added] Building static binaries
 - [added] Building i686 rpm
 - [changed] Restructured example config
-- [changed] Changed Rust version to 1.50.0
+- [changed] Changed Rust version to 1.51.0
 - [changed] Updated dependencies
 - [changed] Change permissions of /etc/vpncloud
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "vpncloud"
-version = "2.1.0"
+version = "2.2.0"
 authors = ["Dennis Schwerdel <schwerdel@googlemail.com>"]
 build = "build.rs"
 license = "GPL-3.0"
@@ -12,7 +12,7 @@ readme = "README.md"
 edition = "2018"
 
 [package.metadata]
-toolchain = "1.50.0"
+toolchain = "1.51.0"
 upx_version = "3.96"
 
 [dependencies]

README.md

@@ -19,7 +19,7 @@ peers:
   - REMOTE_HOST:PORT
 ```
 
-For more information, please see the [Website](https://vpncloud.ddswd.de) or the [Forum](https://groups.google.com/forum/#!forum/vpncloud).
+For more information, please see the [Website](https://vpncloud.ddswd.de) or the [Discussions group](https://github.com/dswd/vpncloud/discussions).
 
 
 ### Project Status

assets/changelog.txt

@@ -1,3 +1,17 @@
+vpncloud (2.2.0) stable; urgency=medium
+
+ * [added] Service target file (thanks to mnhauke)
+ * [added] Added interactive configuration wizard
+ * [added] Support for (un-)installation
+ * [added] Building static binaries
+ * [added] Building i686 rpm
+ * [changed] Restructured example config
+ * [changed] Changed Rust version to 1.51.0
+ * [changed] Updated dependencies
+ * [changed] Change permissions of /etc/vpncloud
+
+ -- Dennis Schwerdel <schwerdel+vpncloud@googlemail.com>  Tue, 06 Apr 2021 12:27:00 +0200
+
 vpncloud (2.1.0) stable; urgency=medium
 
   * [added] Support for websocket proxy mode
@@ -9,7 +23,7 @@ vpncloud (2.1.0) stable; urgency=medium
   * [fixed] Added missing peer address propagation
   * [fixed] Fixed problem with peer addresses without port
 
- -- Dennis Schwerdel <schwerdel@googlemail.com>  Sat, 06 Feb 2020 13:13:00 +0100
+ -- Dennis Schwerdel <schwerdel@googlemail.com>  Sat, 06 Feb 2021 13:13:00 +0100
 
 vpncloud (2.0.1) stable; urgency=medium
 

contrib/asciinema-recorder/Dockerfile

@@ -1,9 +1,13 @@
 FROM ubuntu
 
-RUN apt-get update && apt-get install -y asciinema
+RUN apt-get update && apt-get install -y asciinema locales bash iputils-ping
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
+ENV LANG en_US.UTF-8  
+ENV LANGUAGE en_US:en  
+ENV LC_ALL en_US.UTF-8
 RUN mkdir /root/.asciinema
 RUN mkdir /etc/vpncloud
 
 WORKDIR /data
 ADD config /root/.asciinema/config
-RUN echo 'PS1="\[\e[00;34m\]\[\e[01;31m\]\u\[\e[00;01;34m\]@\[\e[00;34m\]node\[\e[01;31m\]:\[\e[00;34m\]\w\[\e[01;31m\]> \[\e[00m\]"' >> /root/.bashrc
+RUN echo 'PS1="\[\e[00;34m\]\[\e[01;31m\]\u\[\e[00;01;34m\]@\[\e[00;34m\]node\[\e[01;31m\]:\[\e[00;34m\]\w\[\e[01;31m\]> \[\e[00m\]"' >> /root/.bashrc

contrib/asciinema-recorder/config

@@ -1,3 +1,3 @@
 [record]
-command = /usr/bin/bash -l
-idle_time_limit = 2.5
+command = bash -l
+idle_time_limit = 2.5

contrib/asciinema-recorder/recorder.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+cd $(dirname $0)
+
+docker build -t asciinema-recorder .
+docker run -it --rm --network host \
+  -v $(pwd):/data \
+  -v /etc/hosts:/etc/hosts \
+  asciinema-recorder