Nginx: changed to ondrej/nginx (#71)

* Dockerfile: moving from nginx to ondrej PPA

Base OS moved from Ubuntu 18.04 —> 20.04

* Travis: updated for parallelism

Co-authored-by: Bryan Latten <[email protected]>

.test.env

@@ -0,0 +1,8 @@
+SERVER_LOG_MINIMAL=1
+SERVER_APP_NAME=docker-nginx
+S6_KILL_FINISH_MAXTIME=1
+S6_KILL_GRACETIME=1
+SERVER_WORKER_PROCESSES=1
+SERVER_CLIENT_HEADER_BUFFER_SIZE=8k
+SERVER_LARGE_CLIENT_HEADER_BUFFERS=8 16k
+SERVER_CLIENT_BODY_BUFFER_SIZE=128k

.travis.yml

@@ -1,16 +1,17 @@
 sudo: required
 
+env:
+  - DOCKERFILE=Dockerfile
+  - DOCKERFILE=Dockerfile-alpine
+  - DOCKERFILE=Dockerfile-centos
+
 services:
   - docker
 
 script:
-- docker-compose build ubuntu
-- docker-compose build alpine
-- docker-compose build centos
-- docker-compose up -d
+- docker build -t nginxtest -f ${DOCKERFILE} .
+- docker run -p 8080:8080 -d nginxtest
+- docker run -p 8081:8080 -d --env-file ./.test.env nginxtest
 - sleep 5
-- docker-compose ps
 - curl localhost:8080 | grep "Welcome to nginx!"
 - curl localhost:8081 | grep "Welcome to nginx!"
-- curl localhost:8082 | grep "Welcome to nginx!"
-- docker-compose kill

Dockerfile

@@ -1,4 +1,4 @@
-FROM behance/docker-base:2.6-ubuntu-18.04
+FROM behance/docker-base:2.6-ubuntu-20.04
 MAINTAINER Bryan Latten <[email protected]>
 
 # Use in multi-phase builds, when an init process requests for the container to gracefully exit, so that it may be committed
@@ -21,7 +21,7 @@ RUN /bin/bash -e /security_updates.sh && \
     apt-get install --no-install-recommends -yqq \
         software-properties-common \
     && \
-    add-apt-repository ppa:nginx/development -y && \
+    add-apt-repository ppa:ondrej/nginx -y && \
     apt-get update -yqq && \
     apt-get install -yqq --no-install-recommends \
         nginx-light \