Reapply Alpine 3.14 and install latest Docker deb

Author: neomantra

.travis.yml

@@ -20,6 +20,13 @@ os: linux
 dist: focal
 language: generic
 
+addons:
+  apt:
+    sources:
+    - sourceline: 'deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable'
+    packages:
+    - docker
+
 services:
   - docker
 

CHANGELOG.md

@@ -4,7 +4,8 @@ Changelog
 ## 1.19.9.1-0
 
  * Upgrade OpenResty to 1.19.9.1 (#188)
- * `alpine` and `alpine-apk` are both Alpine 3.13 (#187)
+ * `alpine` and `alpine-apk` are both Alpine 3.14 (#187)
+ * Build with Ubuntu Focal and latest Docker
 
 ## 1.19.3.2-3
 

README.md

@@ -262,7 +262,7 @@ docker build --build-arg RESTY_J=4 -f bionic/Dockerfile .
 | Key | Default | Description |
 :----- | :-----: |:----------- |
 |RESTY_IMAGE_BASE | "ubuntu" / "alpine" | The Debian or Alpine Docker image base to build `FROM`. |
-|RESTY_IMAGE_TAG  | "bionic" / "3.13" | The Debian or Alpine Docker image tag to build `FROM`. |
+|RESTY_IMAGE_TAG  | "bionic" / "3.14" | The Debian or Alpine Docker image tag to build `FROM`. |
 |RESTY_VERSION | 1.19.9.1 | The version of OpenResty to use. |
 |RESTY_LUAROCKS_VERSION | 3.7.0 | The version of LuaRocks to use. |
 |RESTY_OPENSSL_VERSION | 1.1.1k | The version of OpenSSL to use. |
@@ -394,7 +394,7 @@ docker build --build-arg RESTY_IMAGE_TAG="3.12" -f alpine-apk/Dockerfile .
 | Key | Default | Description |
 :----- | :-----: |:----------- |
 |RESTY_IMAGE_BASE   | "alpine" | The Alpine Docker image base to build `FROM`. |
-|RESTY_IMAGE_TAG    | "3.13" | The Alpine Docker image tag to build `FROM`. |
+|RESTY_IMAGE_TAG    | "3.14" | The Alpine Docker image tag to build `FROM`. |
 |RESTY_APK_KEY_URL  | "http://openresty.org/package/admin@openresty.com-5ea678a6.rsa.pub" | The URL of the signing key of the `openresty` package. |
 |RESTY_APK_REPO_URL | "http://openresty.org/package/alpine/v${RESTY_IMAGE_TAG}/main" | The URL of the APK repository for `openresty` package. |
 |RESTY_APK_VERSION | "=1.19.9.1-r0" | The suffix to add to the apk install package name: `openresty${RESTY_APK_VERSION`}. |

alpine-apk/Dockerfile

@@ -2,15 +2,15 @@
 # https://github.com/openresty/docker-openresty
 
 ARG RESTY_IMAGE_BASE="alpine"
-ARG RESTY_IMAGE_TAG="3.13"
+ARG RESTY_IMAGE_TAG="3.14"
 
 FROM ${RESTY_IMAGE_BASE}:${RESTY_IMAGE_TAG}
 
 LABEL maintainer="Evan Wies <evan@neomantra.net>"
 
 # Docker Build Arguments
 ARG RESTY_IMAGE_BASE="alpine"
-ARG RESTY_IMAGE_TAG="3.13"
+ARG RESTY_IMAGE_TAG="3.14"
 
 ARG RESTY_APK_KEY_URL="http://openresty.org/package/admin@openresty.com-5ea678a6.rsa.pub"
 ARG RESTY_APK_REPO_URL="http://openresty.org/package/alpine/v${RESTY_IMAGE_TAG}/main"

alpine/Dockerfile

@@ -2,15 +2,15 @@
 # https://github.com/openresty/docker-openresty
 
 ARG RESTY_IMAGE_BASE="alpine"
-ARG RESTY_IMAGE_TAG="3.13"
+ARG RESTY_IMAGE_TAG="3.14"
 
 FROM ${RESTY_IMAGE_BASE}:${RESTY_IMAGE_TAG}
 
 LABEL maintainer="Evan Wies <evan@neomantra.net>"
 
 # Docker Build Arguments
 ARG RESTY_IMAGE_BASE="alpine"
-ARG RESTY_IMAGE_TAG="3.13"
+ARG RESTY_IMAGE_TAG="3.14"
 ARG RESTY_VERSION="1.19.9.1"
 ARG RESTY_OPENSSL_VERSION="1.1.1k"
 ARG RESTY_OPENSSL_PATCH_VERSION="1.1.1f"