rebase to bionic

Author: aptalca

Dockerfile

@@ -1,11 +1,11 @@
-FROM lsiobase/ubuntu:xenial
+FROM lsiobase/ubuntu:bionic
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG OPENVPNAS_VERSION 
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="sparklyballs"
+LABEL maintainer="sparklyballs,aptalca"
 
 # environment settings
 ARG DEBIAN_FRONTEND="noninteractive"
@@ -22,13 +22,13 @@ RUN \
  echo "**** download openvpn-as ****" && \
  if [ -z ${OPENVPNAS_VERSION+x} ]; then \
 	OPENVPNAS_VERSION=$(curl -w "%{url_effective}" -ILsS -o /dev/null \
-	https://openvpn.net/downloads/openvpn-as-latest-ubuntu16.amd_64.deb \
-	| awk -F '(openvpn-as-|-Ubuntu16)' '{print $2}'); \
+	https://openvpn.net/downloads/openvpn-as-latest-ubuntu18.amd_64.deb \
+	| awk -F '(openvpn-as-|-Ubuntu18)' '{print $2}'); \
  fi && \
  mkdir /openvpn && \
  curl -o \
  /openvpn/openvpn.deb -L \
-	"https://swupdate.openvpn.org/as/openvpn-as-${OPENVPNAS_VERSION}-Ubuntu16.amd_64.deb" && \
+	"https://swupdate.openvpn.org/as/openvpn-as-${OPENVPNAS_VERSION}-Ubuntu18.amd_64.deb" && \
  echo "**** ensure home folder for abc user set to /config ****" && \
  usermod -d /config abc && \
  echo "**** create admin user and set default password for it ****" && \

Jenkinsfile

@@ -104,7 +104,7 @@ pipeline {
       steps{
         script{
           env.EXT_RELEASE = sh(
-            script: ''' curl -w '%{url_effective}' -ILsS https://openvpn.net/downloads/openvpn-as-latest-ubuntu16.amd_64.deb -o /dev/null | awk -F '(openvpn-as-|-Ubuntu16)' '{print $2}' ''',
+            script: ''' curl -w '%{url_effective}' -ILsS https://openvpn.net/downloads/openvpn-as-latest-ubuntu18.amd_64.deb -o /dev/null | awk -F '(openvpn-as-|-Ubuntu18)' '{print $2}' ''',
             returnStdout: true).trim()
             env.RELEASE_LINK = 'custom_command'
         }

README.md

@@ -38,6 +38,14 @@ The architectures supported by this image are:
 | :----: | --- |
 | x86-64 | latest |
 
+## Version Tags
+
+This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them.
+
+| Tag | Description |
+| :----: | --- |
+| latest | Stable releases based on ubuntu bionic |
+| xenial | Stable releases based on ubuntu xenial |
 
 ## Usage
 
@@ -197,6 +205,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **25.07.19:** - Create a xenial branch/tag and rebase master/latest to bionic.
 * **07.04.19:** - Fix first time config.
 * **03.04.19:** - Big rewrite of the install and update logic of openvpn-as to fix breaking changes (should fix updating from 2.6.1 to 2.7.3), added mysql-client for cluster support.
 * **14.03.19:** - Update deb package URL.

jenkins-vars.yml

@@ -3,7 +3,7 @@
 # jenkins variables
 project_name: docker-openvpn-as
 external_type: na
-custom_version_command: "curl -w '%{url_effective}' -ILsS https://openvpn.net/downloads/openvpn-as-latest-ubuntu16.amd_64.deb -o /dev/null | awk -F '(openvpn-as-|-Ubuntu16)' '{print $2}'"
+custom_version_command: "curl -w '%{url_effective}' -ILsS https://openvpn.net/downloads/openvpn-as-latest-ubuntu18.amd_64.deb -o /dev/null | awk -F '(openvpn-as-|-Ubuntu18)' '{print $2}'"
 release_type: stable
 release_tag: latest
 ls_branch: master

readme-vars.yml

@@ -13,7 +13,10 @@ available_architectures:
   - { arch: "{{ arch_x86_64 }}", tag: "latest"}
 
 # development version
-development_versions: false
+development_versions: true
+development_versions_items:
+  - { tag: "latest", desc: "Stable releases based on ubuntu bionic" }
+  - { tag: "xenial", desc: "Stable releases based on ubuntu xenial" }
 
 # container parameters
 common_param_env_vars_enabled: true
@@ -60,6 +63,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "25.07.19:", desc: "Create a xenial branch/tag and rebase master/latest to bionic." }
   - { date: "07.04.19:", desc: "Fix first time config." }
   - { date: "03.04.19:", desc: "Big rewrite of the install and update logic of openvpn-as to fix breaking changes (should fix updating from 2.6.1 to 2.7.3), added mysql-client for cluster support." }
   - { date: "14.03.19:", desc: "Update deb package URL." }