Removed references to Nginx 1.13 images

README.md

@@ -82,16 +82,8 @@ Setup a Magento 2 Development Environment with Docker
 View Dockerfiles:
 
 - [markoshust/magento-nginx (Docker Hub)](https://hub.docker.com/r/markoshust/magento-nginx/)
-  - 1.13
-      - [`latest`, `1.13`, `1.13-8`](https://github.com/markshust/docker-magento/tree/master/images/nginx/1.13)
-      - [`1.13-7`](https://github.com/markshust/docker-magento/tree/27.0.0/images/nginx/1.13)
-      - [`1.13-6`](https://github.com/markshust/docker-magento/tree/20.1.1/images/nginx/1.13)
-      - [`1.13-5`](https://github.com/markshust/docker-magento/tree/18.1.1/images/nginx/1.13)
-      - [`1.13-4`](https://github.com/markshust/docker-magento/tree/18.0.1/images/nginx/1.13)
-      - [`1.13-3`](https://github.com/markshust/docker-magento/tree/15.0.1/images/nginx/1.13)
-      - [`1.13-2`](https://github.com/markshust/docker-magento/tree/12.0.0/images/nginx/1.13)
-      - [`1.13-1`](https://github.com/markshust/docker-magento/tree/11.1.5/images/nginx/1.13)
-      - [`1.13-0`](https://github.com/markshust/docker-magento/tree/11.0.0/images/nginx/1.13)
+  - 1.18
+      - [`latest`, `1.18`, `1.18-0`](https://github.com/markshust/docker-magento/tree/master/images/nginx/1.18)
 - [markoshust/magento-php (Docker Hub)](https://hub.docker.com/r/markoshust/magento-php/)
   - 7.3
       - [`latest`, `7.3-fpm`, `7.3-fpm-6`](https://github.com/markshust/docker-magento/tree/master/images/php/7.3)
@@ -113,8 +105,10 @@ View Dockerfiles:
       - [`7.2-fpm-1`](https://github.com/markshust/docker-magento/tree/23.1.1/images/php/7.2)
       - [`7.2-fpm-0`](https://github.com/markshust/docker-magento/tree/23.0.0/images/php/7.2)
 - [markoshust/magento-elasticsearch (Docker Hub)](https://hub.docker.com/r/markoshust/magento-elasticsearch/)
+  - 7.6
+      - [`latest`, `7.6`, `7.6.2-0`](https://github.com/markshust/docker-magento/tree/master/images/elasticsearch/7.6)
   - 6.5
-      - [`latest`, `6.5`, `6.5.4-0`](https://github.com/markshust/docker-magento/tree/master/images/elasticsearch/6.5)
+      - [`6.5`, `6.5.4-0`](https://github.com/markshust/docker-magento/tree/master/images/elasticsearch/6.5)
 
 ## Usage
 

images/nginx/1.13/Dockerfile

@@ -1,34 +0,0 @@
-FROM nginx:1.13
-MAINTAINER Mark Shust <mark@shust.com>
-
-RUN groupadd -g 1000 app \
- && useradd -g 1000 -u 1000 -d /var/www -s /bin/bash app
-RUN touch /var/run/nginx.pid
-RUN mkdir /sock
-
-RUN apt-get update && apt-get install -y \
-  curl \
-  libnss3-tools \
-  openssl
-
-RUN mkdir /etc/nginx/certs \
-  && echo -e "\n\n\n\n\n\n\n" | openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/certs/nginx.key -out /etc/nginx/certs/nginx.crt
-RUN ( \
-  cd /usr/local/bin/ \
-  && curl -L https://github.com/FiloSottile/mkcert/releases/download/v1.4.1/mkcert-v1.4.1-linux-amd64 -o mkcert \
-  && chmod +x mkcert \
-  )
-
-COPY ./conf/nginx.conf /etc/nginx/
-COPY ./conf/default.conf /etc/nginx/conf.d/
-
-RUN mkdir -p /etc/nginx/html /var/www/html \
-  && chown -R app:app /etc/nginx /var/www /var/cache/nginx /var/run/nginx.pid /sock
-
-EXPOSE 8443
-
-USER app:app
-
-VOLUME /var/www
-
-WORKDIR /var/www/html

images/nginx/1.13/conf/default.conf

@@ -1,19 +0,0 @@
-upstream fastcgi_backend {
-  server unix:/sock/docker.sock;
-}
-
-server {
-  listen 8000;
-  return 301 https://$host$request_uri;
-}
-
-server {
-  listen 8443 ssl;
-
-  ssl_certificate /etc/nginx/certs/nginx.crt;
-  ssl_certificate_key /etc/nginx/certs/nginx.key;
-
-  set $MAGE_ROOT /var/www/html;
-
-  include /var/www/html/nginx[.]conf;
-}

images/nginx/1.13/conf/default.magento1.conf

@@ -1,35 +0,0 @@
-upstream fastcgi_backend {
-  server unix:/sock/docker.sock;
-}
-
-server {
-  listen 8000;
-  server_name localhost;
-
-  set $MAGE_ROOT /var/www/html;
-  set $MAGE_IS_DEVELOPER_MODE true;
-
-  root $MAGE_ROOT;
-
-  index index.php;
-  autoindex off;
-  charset off;
-
-  add_header 'X-Content-Type-Options' 'nosniff';
-
-  location / {
-    try_files $uri $uri/ /index.php?$args;
-  }
-  
-  location ~ cron\.php {
-    deny all;
-  }
-
-  location ~* \.php$ {
-    try_files $uri =404;
-    fastcgi_pass fastcgi_backend;
-    fastcgi_index index.php;
-    fastcgi_param SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-    include fastcgi_params;
-  }
-}

images/nginx/1.13/conf/nginx.conf

@@ -1,34 +0,0 @@
-# let's assume dual-core machine
-worker_processes 2;
-
-error_log /var/log/nginx/error.log debug;
-pid /var/run/nginx.pid;
-
-events {
-  # this should be equal to value of "ulimit -n"
-  # reference: https://www.digitalocean.com/community/tutorials/how-to-optimize-nginx-configuration
-  worker_connections 1048576;
-}
-
-http {
-  include /etc/nginx/mime.types;
-  default_type application/octet-stream;
-
-  log_format main
-    '$remote_addr - $remote_user [$time_local] "$request" '
-    '$status $body_bytes_sent "$http_referer" '
-    '"$http_user_agent" "$http_x_forwarded_for"';
-
-  access_log /var/log/nginx/access.log main;
-
-  sendfile on;
-  #tcp_nopush on;
-
-  keepalive_timeout 65;
-
-  #gzip on;
-
-  client_max_body_size 20M;
-
-  include /etc/nginx/conf.d/*.conf;
-}