diff --git a/README.md b/README.md index 34eb1fe..11cdb2f 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ## Supported tags and respective `Dockerfile` links -* [`python3.7` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-docker/blob/master/python3.7/Dockerfile) +* [`python3.7`, `latest` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-docker/blob/master/python3.7/Dockerfile) * [`python3.6` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-docker/blob/master/python3.6/Dockerfile) * [`python3.6-alpine3.7` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-docker/blob/master/python3.6-alpine3.7/Dockerfile) * [`python3.6-alpine3.8` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-docker/blob/master/python3.6-alpine3.8/Dockerfile) @@ -10,7 +10,6 @@ * [`python2.7` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-docker/blob/master/python2.7/Dockerfile) * [`python2.7-alpine3.7` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-docker/blob/master/python2.7-alpine3.7/Dockerfile) * [`python2.7-alpine3.8` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-docker/blob/master/python2.7-alpine3.8/Dockerfile) -* [`latest` _(Dockerfile)_](https://github.com/tiangolo/uwsgi-nginx-docker/blob/master/latest/Dockerfile) ## Temporarily not supported @@ -20,21 +19,6 @@ **Docker** image with **uWSGI** and **Nginx** for web applications in **Python 3.7**, **Python 3.6**, **Python 3.5** and **Python 2.7** (as **Flask**) in a single container. Optionally with Alpine Linux. -## NOTICE - -Soon the tag `latest` will point to `python3.6` instead of `python2.7`. - -If you are using in your `Dockerfile`: - -```Dockerfile -FROM tiangolo/uwsgi-nginx:latest -``` - -you should update it to: - -```Dockerfile -FROM tiangolo/uwsgi-nginx:python2.7 -``` ## Description diff --git a/latest/Dockerfile b/latest/Dockerfile deleted file mode 100644 index 76161f3..0000000 --- a/latest/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM tiangolo/uwsgi-nginx:python2.7 - -LABEL maintainer="Sebastian Ramirez " - -RUN apt-get update && apt-get install -y cowsay - -ENV PATH $PATH:/usr/games - -COPY entrypoint.sh /entrypoint.sh - -RUN chmod +x /entrypoint.sh - -ENTRYPOINT ["/entrypoint.sh"] - -CMD ["/usr/bin/supervisord"] \ No newline at end of file diff --git a/latest/entrypoint.sh b/latest/entrypoint.sh deleted file mode 100644 index 4f062a9..0000000 --- a/latest/entrypoint.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash -set -e - -# Get the maximum upload file size for Nginx, default to 0: unlimited -USE_NGINX_MAX_UPLOAD=${NGINX_MAX_UPLOAD:-0} -# Generate Nginx config for maximum upload file size -echo "client_max_body_size $USE_NGINX_MAX_UPLOAD;" > /etc/nginx/conf.d/upload.conf - -# Get the listen port for Nginx, default to 80 -USE_LISTEN_PORT=${LISTEN_PORT:-80} -# Modify Nignx config for listen port -sed -i -e "/server {/a\ listen ${USE_LISTEN_PORT};" /etc/nginx/conf.d/nginx.conf - -echo -e "WARNING: YOU SHOULDN'T BE USING THE 'latest' DOCKER TAG. - -The Docker tag 'latest' will be for Python 3.6 soon. - -If you need Python 2.7, specify it with: - -FROM tiangolo/uwsgi-nginx:python2.7 - -If you need Python 3.6, specify it with: - -FROM tiangolo/uwsgi-nginx:python3.6 - -Listen to the cow..." - -for i in {1..6} -do - cowsay "WARNING: don't use 'latest', instead use: - -FROM tiangolo/uwsgi-nginx:python2.7 - -or - -FROM tiangolo/uwsgi-nginx:python3.6"; - - sleep 10; -done - -exec "$@" \ No newline at end of file