update build

Author: noogen

Dockerfile

@@ -1,89 +1,53 @@
-FROM hyperknot/baseimage16:1.0.2
-
-MAINTAINER friends@niiknow.org
-
+FROM hyperknot/baseimage16:1.0.2 AS buildstep
 ENV LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 LANGUAGE=en_US.UTF-8 \
     TERM=xterm container=docker DEBIAN_FRONTEND=noninteractive \
+    NGINX_DEVEL_KIT_VERSION=0.3.0 NGINX_SET_MISC_MODULE_VERSION=0.31 \
     NGINX_VERSION=1.13.6
-
-ENV NGINX_BUILD_DIR=/usr/src/nginx/nginx-${NGINX_VERSION} \
-    NGINX_DEVEL_KIT_VERSION=0.3.0 NGINX_SET_MISC_MODULE_VERSION=0.31
-
 ADD ./build/src/ /tmp/
+RUN bash /tmp/ubuntu.sh
 
-RUN \
-    cd /tmp \
-    && bash ubuntu.sh
 
-# build 2
 FROM hyperknot/baseimage16:1.0.2
 
 MAINTAINER friends@niiknow.org
 
-# files are nginx_***_adm64.deb or nginx-dbg_***_adm64.deb
-
 ENV LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 LANGUAGE=en_US.UTF-8 \
     TERM=xterm container=docker DEBIAN_FRONTEND=noninteractive \
-    NGINX_VERSION=1.13.6-1~xenial_amd64.deb
+    NGINX_VERSION=_1.13.6-1~xenial_amd64.deb \
+    NGINX_DEBUG=-dbg${NGINX_VERSION}
 
-COPY --from=0 /usr/src/nginx/nginx_${NGINX_VERSION} /tmp
+COPY --from=buildstep /usr/src/nginx/nginx${NGINX_VERSION} /tmp
 
-# start
-RUN \
-    cd /tmp \
-
-# increase ulimit
+RUN cd /tmp \
     && echo "\n\n* soft nofile 800000\n* hard nofile 800000\n\n" >> /etc/security/limits.conf \
-
-# add nginx repo
     && curl -s https://nginx.org/keys/nginx_signing.key | apt-key add - \
     && cp /etc/apt/sources.list /etc/apt/sources.list.bak \
     && echo "deb http://nginx.org/packages/mainline/ubuntu/ xenial nginx" | tee -a /etc/apt/sources.list \
     && echo "deb-src http://nginx.org/packages/mainline/ubuntu/ xenial nginx" | tee -a /etc/apt/sources.list \
-
-# update repo
     && apt-get update -y && apt-get upgrade -y --no-install-recommends --no-install-suggests \
     && apt-get install -y --no-install-recommends --no-install-suggests \
        nano libgd3 gettext-base unzip rsync \
     && dpkg --configure -a \
-
-# install nginx
-    && dpkg -i nginx_${NGINX_VERSION} \
-
-#    && dpkg -i nginx-dbg_${NGINX_VERSION} \
-
-# delete dummy conf
+    && dpkg -i nginx${NGINX_VERSION} \
     && rm -rf /etc/nginx/conf.d/default.conf \
-
-# re-enable all default services
     && rm -f /etc/service/syslog-forwarder/down \
     && rm -f /etc/service/cron/down \
     && rm -f /etc/service/syslog-ng/down \
     && rm -f /core \
-
-# forward request and error logs to docker log collector
     && ln -sf /dev/stdout /var/log/nginx/access.log \
     && ln -sf /dev/stderr /var/log/nginx/error.log \
     && service nginx stop && update-rc.d -f nginx disable \
-
-# cleanup
     && apt-get clean -y && apt-get autoclean -y \
     && apt-get autoremove --purge -y \
     && rm -rf /var/lib/apt/lists/* /var/lib/log/* /tmp/* /var/tmp/*
 
 ADD ./files /
 
-RUN \
-# generate fake ssl for server conf, allow for replacing it later
-    bash /root/bin/placeholder-ssl.sh \
+RUN bash /root/bin/placeholder-ssl.sh \
     && mkdir -p /app-start/etc \
-
-# redirect /etc/nginx
     && mv /etc/nginx /app-start/etc/nginx \
     && rm -rf /etc/nginx \
     && ln -s /app/etc/nginx /etc/nginx \
-
-# redirect logs
     && mkdir -p /app-start/var/log \
     && mv /var/log/nginx /app-start/var/log/nginx \
     && rm -rf /var/log/nginx \

build/src/ubuntu.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+export NGINX_BUILD_DIR=/usr/src/nginx/nginx-${NGINX_VERSION} 
 cd /tmp
 
 curl -sL "https://github.com/simpl/ngx_devel_kit/archive/v$NGINX_DEVEL_KIT_VERSION.tar.gz" -o dev-kit.tar.gz