remove 1.18

.drone.yml

@@ -8,20 +8,13 @@ platform:
   arch: amd64
 
 steps:
-- name: build-1.18
+- name: build-table
   commands:
-  - docker build --pull -t pdr.nephatrine.net/nephatrine/nginx-ssl:1.18 -f Dockerfile-1.18 .
-  - HOME=/mnt/config/home docker push pdr.nephatrine.net/nephatrine/nginx-ssl:1.18
-  - docker tag pdr.nephatrine.net/nephatrine/nginx-ssl:1.18 nephatrine/nginx-ssl:1.18
-  - HOME=/mnt/config/home docker push nephatrine/nginx-ssl:1.18
-  - docker rmi pdr.nephatrine.net/nephatrine/nginx-ssl:1.18
-- name: build-1.20
-  commands:
-  - docker build --pull -t pdr.nephatrine.net/nephatrine/nginx-ssl:1.20 -f Dockerfile-1.20 .
-  - HOME=/mnt/config/home docker push pdr.nephatrine.net/nephatrine/nginx-ssl:1.20
-  - docker tag pdr.nephatrine.net/nephatrine/nginx-ssl:1.20 nephatrine/nginx-ssl:1.20
-  - HOME=/mnt/config/home docker push nephatrine/nginx-ssl:1.20
-  - docker rmi pdr.nephatrine.net/nephatrine/nginx-ssl:1.20
+  - docker build --pull -t pdr.nephatrine.net/nephatrine/nginx-ssl:stable -f Dockerfile-stable .
+  - HOME=/mnt/config/home docker push pdr.nephatrine.net/nephatrine/nginx-ssl:stable
+  - docker tag pdr.nephatrine.net/nephatrine/nginx-ssl:stable nephatrine/nginx-ssl:stable
+  - HOME=/mnt/config/home docker push nephatrine/nginx-ssl:stable
+  - docker rmi pdr.nephatrine.net/nephatrine/nginx-ssl:stable
 - name: build-latest
   commands:
   - docker build --pull -t pdr.nephatrine.net/nephatrine/nginx-ssl:latest .
@@ -56,6 +49,6 @@ trigger:
 
 ---
 kind: signature
-hmac: 90cd34babaef164703798e721c3aa9830a82004b3d86646dab75e34e3ca3a3a5
+hmac: 81393e18146a36f9c49d749cc8afcb1dd7d3ed0c50c2ff4e060b71739d7efb86
 
 ...

Dockerfile

@@ -1,4 +1,4 @@
-FROM nephatrine/alpine-s6:3.13
+FROM nephatrine/alpine-s6:latest
 LABEL maintainer="Daniel Wolf <nephatrine@gmail.com>"
 
 RUN echo "====== INSTALL PACKAGES ======" \

Dockerfile-1.18

@@ -1,85 +0,0 @@
-FROM nephatrine/alpine-s6:3.11
-LABEL maintainer="Daniel Wolf <nephatrine@gmail.com>"
-
-RUN echo "====== INSTALL PACKAGES ======" \
- && apk add certbot geoip libgd libxslt pcre py3-pip \
- && pip3 install zope.component \
- && rm -rf /var/cache/apk/*
-
-ARG NGINX_VERSION=branches/stable-1.18
-
-RUN echo "====== COMPILE NGINX ======" \
- && apk add --virtual .build-nginx \
-   build-base \
-   gd-dev \
-   geoip-dev \
-   git \
-   libatomic_ops-dev \
-   libressl-dev \
-   libxml2-dev \
-   libxslt-dev \
-   linux-headers \
-   pcre-dev \
-   zlib-dev \
- && cd /usr/src \
- && git clone https://github.com/nginx/nginx.git \
- && cd nginx \
- && git fetch && git fetch --tags \
- && git checkout "$NGINX_VERSION" \
- && ./auto/configure \
-  --prefix=/var/www \
-  --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 \
-  --pid-path=/var/run/nginx.pid \
-  --lock-path=/var/run/nginx.lock \
-  --user=guardian \
-  --group=users \
-  --with-threads \
-  --with-file-aio \
-  --with-http_ssl_module \
-  --with-http_v2_module \
-  --with-http_realip_module \
-  --with-http_addition_module \
-  --with-http_xslt_module=dynamic \
-  --with-http_image_filter_module=dynamic \
-  --with-http_geoip_module=dynamic \
-  --with-http_sub_module \
-  --with-http_dav_module \
-  --with-http_mp4_module \
-  --with-http_gunzip_module \
-  --with-http_gzip_static_module \
-  --with-http_auth_request_module \
-  --with-http_random_index_module \
-  --with-http_secure_link_module \
-  --with-http_slice_module \
-  --http-log-path=/var/log/nginx/access.log \
-  --http-client-body-temp-path=/var/cache/nginx/client_body \
-  --http-proxy-temp-path=/var/cache/nginx/proxy \
-  --http-fastcgi-temp-path=/var/cache/nginx/fastcgi \
-  --http-uwsgi-temp-path=/var/cache/nginx/uwsgi \
-  --http-scgi-temp-path=/var/cache/nginx/scgi \
-  --with-mail=dynamic \
-  --with-mail_ssl_module \
-  --with-stream=dynamic \
-  --with-stream_ssl_module \
-  --with-stream_realip_module \
-  --with-stream_geoip_module=dynamic \
-  --with-stream_ssl_preread_module \
-  --with-compat \
-  --with-pcre \
-  --with-pcre-jit \
-  --with-libatomic \
- && make -j4 \
- && make install \
- && strip /usr/sbin/nginx \
- && strip /usr/lib/nginx/modules/*.so \
- && cd /usr/src && rm -rf /usr/src/* \
- && apk del --purge .build-nginx && rm -rf /var/cache/apk/*
-
-RUN echo "====== CONFIGURE SYSTEM ======" \
- && mkdir -p /var/cache/nginx
-
-COPY override /
-EXPOSE 80/tcp 443/tcp

Dockerfile-stable

@@ -1,4 +1,4 @@
-FROM nephatrine/alpine-s6:3.12
+FROM nephatrine/alpine-s6:latest
 LABEL maintainer="Daniel Wolf <nephatrine@gmail.com>"
 
 RUN echo "====== INSTALL PACKAGES ======" \

README.md

@@ -24,10 +24,9 @@ PHP or MySQL are not included.
 
 ## Docker Tags
 
-- **nephatrine/nginx-ssl:testing**: NGINX Master (Alpine Edge)
-- **nephatrine/nginx-ssl:latest**: NGINX Default (Alpine v3.13)
-- **nephatrine/nginx-ssl:1.19**: NGINX v1.20 (Alpine v3.12)
-- **nephatrine/nginx-ssl:1.17**: NGINX v1.18 (Alpine v3.11)
+- **nephatrine/nginx-ssl:testing**: NGINX Master
+- **nephatrine/nginx-ssl:latest**: NGINX Mainline (v.1.21)
+- **nephatrine/nginx-ssl:stable**: NGINX Stable (v1.20)
 
 ## Configuration Variables