improved readme + fixed labels + minor fixes

Author: fabiocicerchia

.github/workflows/main.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Build images
-        run: ./bin/docker-build.sh alpine
+        run: ./bin/docker-build.sh alpine 1
 
       - name: Test images
         run: ./bin/test.sh alpine
@@ -29,7 +29,7 @@ jobs:
         if: github.ref == 'refs/heads/master'
 
       - name: Push images
-        run: ./bin/docker-push.sh alpine
+        run: ./bin/docker-push.sh alpine 1
         if: github.ref == 'refs/heads/master'
 
   docker_amazonlinux:
@@ -38,7 +38,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Build images
-        run: ./bin/docker-build.sh amazonlinux
+        run: ./bin/docker-build.sh amazonlinux 1
 
       - name: Test images
         run: ./bin/test.sh amazonlinux
@@ -48,7 +48,7 @@ jobs:
         if: github.ref == 'refs/heads/master'
 
       - name: Push images
-        run: ./bin/docker-push.sh amazonlinux
+        run: ./bin/docker-push.sh amazonlinux 1
         if: github.ref == 'refs/heads/master'
 
   docker_centos:
@@ -57,7 +57,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Build images
-        run: ./bin/docker-build.sh centos
+        run: ./bin/docker-build.sh centos 1
 
       - name: Test images
         run: ./bin/test.sh centos
@@ -67,7 +67,7 @@ jobs:
         if: github.ref == 'refs/heads/master'
 
       - name: Push images
-        run: ./bin/docker-push.sh centos
+        run: ./bin/docker-push.sh centos 1
         if: github.ref == 'refs/heads/master'
 
   docker_debian:
@@ -76,7 +76,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Build images
-        run: ./bin/docker-build.sh debian
+        run: ./bin/docker-build.sh debian 1
 
       - name: Test images
         run: ./bin/test.sh debian
@@ -86,7 +86,7 @@ jobs:
         if: github.ref == 'refs/heads/master'
 
       - name: Push images
-        run: ./bin/docker-push.sh debian
+        run: ./bin/docker-push.sh debian 1
         if: github.ref == 'refs/heads/master'
 
   docker_fedora:
@@ -95,7 +95,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Build images
-        run: ./bin/docker-build.sh fedora
+        run: ./bin/docker-build.sh fedora 1
 
       - name: Test images
         run: ./bin/test.sh fedora
@@ -105,7 +105,7 @@ jobs:
         if: github.ref == 'refs/heads/master'
 
       - name: Push images
-        run: ./bin/docker-push.sh fedora
+        run: ./bin/docker-push.sh fedora 1
         if: github.ref == 'refs/heads/master'
 
   docker_ubuntu:
@@ -114,7 +114,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Build images
-        run: ./bin/docker-build.sh ubuntu
+        run: ./bin/docker-build.sh ubuntu 1
 
       - name: Test images
         run: ./bin/test.sh ubuntu
@@ -124,5 +124,5 @@ jobs:
         if: github.ref == 'refs/heads/master'
 
       - name: Push images
-        run: ./bin/docker-push.sh ubuntu
+        run: ./bin/docker-push.sh ubuntu 1
         if: github.ref == 'refs/heads/master'

Dockerfile

@@ -0,0 +1 @@
+nginx/1.19.0/alpine/3.12.0/Dockerfile

README.md

@@ -99,10 +99,63 @@ Lua is a lightweight, high-level, multi-paradigm programming language designed p
 
 ### Compiled Version Details
 
-```console
-configure arguments: --prefix=/etc/nginx --sbin-path=/usr/sbin/nginx --modules-path=/usr/lib/nginx/modules --conf-path=/etc/nginx/nginx.conf --error-log-path=/var/log/nginx/error.log --http-log-path=/var/log/nginx/access.log --pid-path=/var/run/nginx.pid --lock-path=/var/run/nginx.lock --http-client-body-temp-path=/var/cache/nginx/client_temp --http-proxy-temp-path=/var/cache/nginx/proxy_temp --http-fastcgi-temp-path=/var/cache/nginx/fastcgi_temp --http-uwsgi-temp-path=/var/cache/nginx/uwsgi_temp --http-scgi-temp-path=/var/cache/nginx/scgi_temp --user=nginx --group=nginx --with-compat --with-file-aio --with-threads --with-http_addition_module --with-http_auth_request_module --with-http_dav_module --with-http_flv_module --with-http_gunzip_module --with-http_gzip_static_module --with-http_mp4_module --with-http_random_index_module --with-http_realip_module --with-http_secure_link_module --with-http_slice_module --with-http_ssl_module --with-http_stub_status_module --with-http_sub_module --with-http_v2_module --with-mail --with-mail_ssl_module --with-stream --with-stream_realip_module --with-stream_ssl_module --with-stream_ssl_preread_module --with-cc-opt='-g -O2 -fstack-protector-strong -Wformat -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fPIC' --with-ld-opt='-Wl,-z,relro -Wl,-z,now -Wl,--as-needed -pie' --add-module=/lua-nginx-module-0.10.15 --add-module=/ngx_devel_kit-0.3.1 --with-http_dav_module --with-http_geoip_module
+```bash
+configure arguments: --prefix=/etc/nginx --sbin-path=/usr/sbin/nginx --modules-path=/usr/lib/nginx/modules --conf-path=/etc/nginx/nginx.conf --error-log-path=/var/log/nginx/error.log --http-log-path=/var/log/nginx/access.log --pid-path=/var/run/nginx.pid --lock-path=/var/run/nginx.lock --http-client-body-temp-path=/var/cache/nginx/client_temp --http-fastcgi-temp-path=/var/cache/nginx/fastcgi_temp --http-proxy-temp-path=/var/cache/nginx/proxy_temp --http-scgi-temp-path=/var/cache/nginx/scgi_temp --http-uwsgi-temp-path=/var/cache/nginx/uwsgi_temp --user=nginx --group=nginx --add-module=/lua-nginx-module-0.10.15 --add-module=/ngx_devel_kit-0.3.1 --with-compat --with-file-aio --with-http_addition_module --with-http_auth_request_module --with-http_dav_module --with-http_dav_module --with-http_flv_module --with-http_geoip_module --with-http_gunzip_module --with-http_gzip_static_module --with-http_mp4_module --with-http_random_index_module --with-http_realip_module --with-http_secure_link_module --with-http_slice_module --with-http_ssl_module --with-http_stub_status_module --with-http_sub_module --with-http_v2_module --with-mail --with-mail_ssl_module --with-stream --with-stream_realip_module --with-stream_ssl_module --with-stream_ssl_preread_module --with-threads --with-cc-opt='-g -O2 -fstack-protector-strong -Wformat -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fPIC' --with-ld-opt='-Wl,-rpath,/usr/local/lib -Wl,-z,relro -Wl,-z,now -Wl,--as-needed -pie'
 ```
 
+The following are the available build-time options. They can be set using the `--build-arg` CLI argument.
+
+| Key | Default | Description |
+:----- | :-----: |:----------- |
+| DOCKER_IMAGE | fabiocicerchia/nginx-lua | |
+| DOCKER_IMAGE_OS | alpine | The Docker image base to build `FROM`. |
+| DOCKER_IMAGE_TAG | 3.12.0 | The Docker image tag to build `FROM`. |
+| VER_LUAJIT | 2.1-20200102 | The version of LuaJIT to use. |
+| VER_LUA_NGINX_MODULE | 0.10.15 | The version of ngx_http_lua_module to use. |
+| VER_LUA_RESTY_CORE | 0.1.17 | The version of lua-resty-core to use. |
+| LUA_LIB_DIR | /usr/local/share/lua/5.1 | Path to Lua library directory. |
+| VER_LUA_RESTY_LRUCACHE | 0.09 | The version of lua-resty-lrucache to use. |
+| VER_NGX_DEVEL_KIT | 0.3.1 | The version of Nginx Development Kit to use. |
+| VER_NGINX | 1.19.0 | The version of nginx to use. |
+| NGINX_BUILD_CONFIG | --prefix=/etc/nginx --sbin-path=/usr/sbin/nginx --modules-path=/usr/lib/nginx/modules --conf-path=/etc/nginx/nginx.conf --error-log-path=/var/log/nginx/error.log --http-log-path=/var/log/nginx/access.log --pid-path=/var/run/nginx.pid --lock-path=/var/run/nginx.lock --http-client-body-temp-path=/var/cache/nginx/client_temp --http-fastcgi-temp-path=/var/cache/nginx/fastcgi_temp --http-proxy-temp-path=/var/cache/nginx/proxy_temp --http-scgi-temp-path=/var/cache/nginx/scgi_temp --http-uwsgi-temp-path=/var/cache/nginx/uwsgi_temp --user=nginx --group=nginx --add-module=/lua-nginx-module-${VER_LUA_NGINX_MODULE} --add-module=/ngx_devel_kit-${VER_NGX_DEVEL_KIT} --with-compat --with-file-aio --with-http_addition_module --with-http_auth_request_module --with-http_dav_module --with-http_dav_module --with-http_flv_module --with-http_geoip_module --with-http_gunzip_module --with-http_gzip_static_module --with-http_mp4_module --with-http_random_index_module --with-http_realip_module --with-http_secure_link_module --with-http_slice_module --with-http_ssl_module --with-http_stub_status_module --with-http_sub_module --with-http_v2_module --with-mail --with-mail_ssl_module --with-stream --with-stream_realip_module --with-stream_ssl_module --with-stream_ssl_preread_module --with-threads | Options to pass to nginx's `./configure` script. |
+| LUAJIT_LIB | /usr/local/lib | Tell nginx's build system where to find LuaJIT 2.0 |
+| LUAJIT_INC | /usr/local/include/luajit-2.1 | Tell nginx's build system where to find LuaJIT 2.0 |
+| LD_LIBRARY_PATH | /usr/local/lib/:$LD_LIBRARY_PATH | Search path environment variable for the linux shared library. |
+| BUILD_DEPS | Differs based on the distro | List of needed packages to build properly the software. |
+| NGINX_BUILD_DEPS | Differs based on the distro | List of needed packages to build properly nginx. |
+| BUILD_DATE | This label contains the Date/Time the image was built. |
+| VCS_REF | Identifier for the version of the source code from which this image was built. |
+| VER_DUMBINIT | 1.2.2 | The version of dumb-init to use. |
+| PKG_DEPS | Differs based on the distro | List of needed packages to run properly the software. |
+
+These built-from-source flavors include the following modules by default, but one can easily increase or decrease that with the custom build options above:
+
+ - file-aio
+ - http_addition_module
+ - http_auth_request_module
+ - http_dav_module
+ - http_dav_module
+ - http_flv_module
+ - http_geoip_module
+ - http_gunzip_module
+ - http_gzip_static_module
+ - http_mp4_module
+ - http_random_index_module
+ - http_realip_module
+ - http_secure_link_module
+ - http_slice_module
+ - http_ssl_module
+ - http_stub_status_module
+ - http_sub_module
+ - http_v2_module
+ - mail
+ - mail_ssl_module
+ - stream
+ - stream_realip_module
+ - stream_ssl_module
+ - stream_ssl_preread_module
+ - thread
+
 ## Run Container
 
 ```bash
@@ -124,7 +177,41 @@ Provides Nginx + LUA. Uses Alpine, Amazon Linux, CentOS, Debian, Fedora, Ubuntu
 ### `fabiocicerchia/nginx-lua:<version>-<distro><version>`
 Provides Nginx + LUA. Uses pinned version for Alpine, Amazon Linux, CentOS, Debian, Fedora, Ubuntu for base image.
 
-## Example
+## Image Labels
+
+The image builds are labeled with various information. Here's an example of printing the labels using jq:
+
+```bash
+$ docker pull fabiocicerchia/nginx-lua:1-alpine
+$ docker inspect fabiocicerchia/nginx-lua:1-alpine | jq '.[].Config.Labels'
+{
+  "maintainer": "Fabio Cicerchia <[email protected]>",
+  "org.label-schema.build-date": "2020-06-27T20:53:15Z",
+  "org.label-schema.description": "Nginx 1.19.0 with LUA support based on alpine 3.12.0.",
+  "org.label-schema.docker.cmd": "docker run -p 80:80 -d fabiocicerchia/nginx-lua:1.19.0-alpine3.12.0",
+  "org.label-schema.name": "fabiocicerchia/nginx-lua",
+  "org.label-schema.schema-version": "1.0",
+  "org.label-schema.url": "https://github.com/fabiocicerchia/nginx-lua",
+  "org.label-schema.vcs-ref": "5b8a255",
+  "org.label-schema.vcs-url": "https://github.com/fabiocicerchia/nginx-lua",
+  "org.label-schema.version": "1.19.0-alpine3.12.0"
+}
+```
+
+| Label Name                         | Description             |
+:----------------------------------- |:----------------------- |
+| `maintainer`                       | Maintainer of the image |
+| `org.label-schema.build-date`      | This label contains the Date/Time the image was built. The value SHOULD be formatted according to RFC 3339. buildarg `BUILD_DATE` |
+| `org.label-schema.description`     | Text description of the image. May contain up to 300 characters. |
+| `org.label-schema.docker.cmd`      | How to run a container based on the image under the Docker runtime. |
+| `org.label-schema.name`            | buildarg `DOCKER_IMAGE` |
+| `org.label-schema.schema-version`  | This label SHOULD be present to indicate the version of Label Schema in use. |
+| `org.label-schema.url`             | URL of website with more information about the product or service provided by the container. |
+| `org.label-schema.vcs-ref`         | buildarg `VCS_REF` |
+| `org.label-schema.vcs-url`         | URL for the source code under version control from which this container image was built. |
+| `org.label-schema.version`         | Release identifier for the contents of the image. |
+
+## Examples
 
 ### Virtual Host
 
@@ -165,6 +252,16 @@ services:
 
 # License
 
+As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc from the base distribution, along with any direct or indirect dependencies of the primary software being contained).
+
+As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses for all software contained within.
+
+ - [Nginx License](https://nginx.org/LICENSE)
+ - [Lua License](https://www.lua.org/license.html)
+ - [OpenResty License](https://github.com/openresty/openresty#copyright--license)
+
+## `fabiocicerchia/nginx-lua`
+
 MIT License
 
 Copyright (c) 2020 Fabio Cicerchia <[email protected]>

bin/docker-build.sh

@@ -4,6 +4,7 @@ source supported_versions
 
 function docker_tag_exists() {
     curl --silent -f -lSL https://index.docker.io/v1/repositories/$1/tags/$2 > /dev/null
+    echo $?
 }
 
 function build() {
@@ -21,9 +22,9 @@ function build() {
     MINOR=$MAJOR.$(echo $NGINX_VER | cut -d '.' -f 2)
     PATCH=$NGINX_VER
 
-    #if docker_tag_exists fabiocicerchia/nginx-lua $PATCH-$OS$OS_VER; then
-    #    return
-    #fi
+    if [ "$FORCE" == "0" -a $(docker_tag_exists fabiocicerchia/nginx-lua $PATCH-$OS$OS_VER) == 0 ]; then
+        return
+    fi
 
     TAGS=""
     if [ "$VER_TAGS$OS_TAGS$DEFAULT" == "111" ]; then
@@ -48,11 +49,9 @@ function build() {
     TAGS="$TAGS -t fabiocicerchia/nginx-lua:$MAJOR-$OS$OS_VER"
 
     BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
-    BUILD_VERSION=$(date +%s)
     VCS_REF=$(git rev-parse --short HEAD)
     time docker build \
         --build-arg BUILD_DATE=$BUILD_DATE \
-        --build-arg BUILD_VERSION=$BUILD_VERSION \
         --build-arg VCS_REF=$VCS_REF \
         $TAGS \
         -f $DOCKERFILE .
@@ -61,6 +60,10 @@ function build() {
 set -x
 
 OS=$1
+FORCE=0
+if [ "$2" == "1" ]; then
+    FORCE=1
+fi
 VERSIONS=()
 if [ "$OS" == "alpine" ]; then VERSIONS=("${ALPINE[@]}")
 elif [ "$OS" == "amazonlinux" ]; then VERSIONS=("${AMAZONLINUX[@]}")

bin/docker-push.sh

@@ -4,6 +4,7 @@ source supported_versions
 
 function docker_tag_exists() {
     curl --silent -f -lSL https://index.docker.io/v1/repositories/$1/tags/$2 > /dev/null
+    echo $?
 }
 
 function push() {
@@ -21,9 +22,9 @@ function push() {
     MINOR=$MAJOR.$(echo $NGINX_VER | cut -d '.' -f 2)
     PATCH=$NGINX_VER
 
-    #if docker_tag_exists fabiocicerchia/nginx-lua $PATCH-$OS$OS_VER; then
-    #    return
-    #fi
+    if [ "$FORCE" == "0" -a $(docker_tag_exists fabiocicerchia/nginx-lua $PATCH-$OS$OS_VER) == 0 ]; then
+        return
+    fi
 
     docker push fabiocicerchia/nginx-lua:$MAJOR-$OS$OS_VER
     docker push fabiocicerchia/nginx-lua:$MINOR-$OS$OS_VER
@@ -50,6 +51,10 @@ function push() {
 set -x
 
 OS=$1
+FORCE=0
+if [ "$2" == "1" ]; then
+    FORCE=1
+fi
 VERSIONS=()
 if [ "$OS" == "alpine" ]; then VERSIONS=$ALPINE
 elif [ "$OS" == "amazonlinux" ]; then VERSIONS=$AMAZONLINUX

nginx/1.19.0/alpine/3.11.6/Dockerfile

@@ -7,10 +7,6 @@ ARG DOCKER_IMAGE_TAG=3.11.6
 ####################################
 FROM $DOCKER_IMAGE_OS:$DOCKER_IMAGE_TAG AS builder
 
-ARG BUILD_DATE
-ARG BUILD_VERSION
-ARG VCS_REF
-
 # https://github.com/openresty/luajit2
 ARG VER_LUAJIT=2.1-20200102
 
@@ -178,6 +174,13 @@ RUN set -eux \
 ##########################################
 FROM $DOCKER_IMAGE_OS:$DOCKER_IMAGE_TAG
 
+ARG DOCKER_IMAGE=fabiocicerchia/nginx-lua
+ARG DOCKER_IMAGE_OS=alpine
+ARG DOCKER_IMAGE_TAG=3.11.6
+ARG VER_NGINX=1.19.0
+ARG BUILD_DATE
+ARG VCS_REF
+
 # http://label-schema.org/rc1/
 LABEL maintainer="Fabio Cicerchia <[email protected]>" \
       org.label-schema.build-date=$BUILD_DATE \

nginx/1.19.0/alpine/3.12.0/Dockerfile

@@ -7,10 +7,6 @@ ARG DOCKER_IMAGE_TAG=3.12.0
 ####################################
 FROM $DOCKER_IMAGE_OS:$DOCKER_IMAGE_TAG AS builder
 
-ARG BUILD_DATE
-ARG BUILD_VERSION
-ARG VCS_REF
-
 # https://github.com/openresty/luajit2
 ARG VER_LUAJIT=2.1-20200102
 
@@ -178,6 +174,13 @@ RUN set -eux \
 ##########################################
 FROM $DOCKER_IMAGE_OS:$DOCKER_IMAGE_TAG
 
+ARG DOCKER_IMAGE=fabiocicerchia/nginx-lua
+ARG DOCKER_IMAGE_OS=alpine
+ARG DOCKER_IMAGE_TAG=3.12.0
+ARG VER_NGINX=1.19.0
+ARG BUILD_DATE
+ARG VCS_REF
+
 # http://label-schema.org/rc1/
 LABEL maintainer="Fabio Cicerchia <[email protected]>" \
       org.label-schema.build-date=$BUILD_DATE \