diff --git a/README.md b/README.md index c1d0959a4..3110f20f9 100644 --- a/README.md +++ b/README.md @@ -2,15 +2,25 @@ [![GitHub issues](https://img.shields.io/github/issues/EpicMorg/docker-scripts.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/issues) [![GitHub forks](https://img.shields.io/github/forks/EpicMorg/docker-scripts.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/network) [![GitHub stars](https://img.shields.io/github/stars/EpicMorg/docker-scripts.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/stargazers) [![GitHub license](https://img.shields.io/github/license/EpicMorg/docker-scripts.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/blob/master/LICENSE) -## Products - -### Atlassian [![Atlassian Bitbucket](https://img.shields.io/badge/Bitbucket-5.16.0-ff69b4.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/tree/master/bitbucket) [![](https://img.shields.io/docker/pulls/epicmorg/bitbucket.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/bitbucket/) - -### Atlassian [![Atlassian Confluence](https://img.shields.io/badge/Confluence-6.14.0-ff69b4.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/tree/master/confluence) [![](https://img.shields.io/docker/pulls/epicmorg/confluence.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/confluence/) - -### Atlassian [![Atlassian Jira](https://img.shields.io/badge/Jira-7.13.1-ff69b4.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/tree/master/jira) [![](https://img.shields.io/docker/pulls/epicmorg/jira.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/jira/) +# Products -### Nginx [![Nginx Mainline](https://img.shields.io/badge/Nginx_Mainline-1.15.8-ff69b4.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/tree/master/balancer) [![](https://img.shields.io/docker/pulls/epicmorg/balancer.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/balancer/) - -### Apache2 + php7 [![Apache2](https://img.shields.io/badge/Apache2-2.4.38-ff69b4.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/tree/master/websites) [![PHP7](https://img.shields.io/badge/PHP7-7.3-ff69b4.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/tree/master/websites) [![](https://img.shields.io/docker/pulls/epicmorg/websites.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/websites/ ) +| Application | Version | Pulls | Notes +| ------ | ------ | ------ | ------ +| ![Atlassian Bitbucket](https://img.shields.io/badge/Atlassian-Bitbucket-brightgreen.svg?style=popout-square) | [![Atlassian Bitbucket](https://img.shields.io/badge/5.16.0-ff69b4.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/tree/master/bitbucket/latest) | [![](https://img.shields.io/docker/pulls/epicmorg/bitbucket.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/bitbucket/) | - +| ![Atlassian Confluence](https://img.shields.io/badge/Atlassian-Confluence-brightgreen.svg?style=popout-square) | [![Atlassian Confluence](https://img.shields.io/badge/6.14.0-ff69b4.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/tree/master/confluence/latest) | [![](https://img.shields.io/docker/pulls/epicmorg/confluence.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/confluence/) | Additionaly have [![Atlassian Bitbucket](https://img.shields.io/badge/5.6.4-ff69b4.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/tree/master/confluence/5.6.4) and [![Atlassian Bitbucket](https://img.shields.io/badge/5.10.8-ff69b4.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/tree/master/confluence/5.10.4) versions. +| ![Atlassian Jira](https://img.shields.io/badge/Atlassian-Jira-brightgreen.svg?style=popout-square) | [![Atlassian Jira](https://img.shields.io/badge/7.13.1-ff69b4.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/tree/master/jira/latest) | [![](https://img.shields.io/docker/pulls/epicmorg/jira.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/jira/) | Additionaly have [![Atlassian Bitbucket](https://img.shields.io/badge/7.10.0-ff69b4.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/tree/master/jira/7.10.0) version. +| ![Nginx Mainline](https://img.shields.io/badge/Nginx%20Mainline-brightgreen.svg?style=popout-square) | [![Nginx Mainline](https://img.shields.io/badge/1.15.8-ff69b4.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/tree/master/balancer) | [![](https://img.shields.io/docker/pulls/epicmorg/balancer.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/balancer/) | Nginx mainline custom build by [Ondrej Sury](https://launchpad.net/~ondrej) with http2 support and some modules. +| ![Apache2](https://img.shields.io/badge/Apache2-brightgreen.svg?style=popout-square) | [![Apache2](https://img.shields.io/badge/2.4.38-ff69b4.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/tree/master/websites) | [![](https://img.shields.io/docker/pulls/epicmorg/websites.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/websites/ ) | Latest pure apache2. +| ![php7](https://img.shields.io/badge/php7-brightgreen.svg?style=popout-square) | [![PHP7](https://img.shields.io/badge/7.3-ff69b4.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/tree/master/websites) | [![](https://img.shields.io/docker/pulls/epicmorg/websites.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/websites/ ) | php 7.3 custom build by [Ondrej Sury](https://launchpad.net/~ondrej). Component of container above. +## Chancgelog + +* 02/11/2019 - updated *balancer* and *websites* images. + * moved from `ubuntu:bionic` to `debian:buster` images. anyone can safely update. + * php `7.2` -> `7.3` + * apache `2.4.34` -> `2.4.38` + * nginx `1.15.8` -> `nginx-full` `1.15.8` (`nginx-extras` is still broken) + * default preinstalled packages to `balancer` and `websites` containers: `ca-certificates`, `apt-transport-https`, `mc`, `iputils-ping` and some other. + * added support for additional locales to `balancer` and `websites` containers (default is `en_US.UTF-8`). + * apt sources switched to `Yandex-Mirror`. +* 01/01/1970 - see commit history. sorry. diff --git a/balancer/Dockerfile b/balancer/Dockerfile index 065997955..ca1010915 100644 --- a/balancer/Dockerfile +++ b/balancer/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:cosmic +FROM debian:buster MAINTAINER Anatoliy Zimovskiy ENV DEBIAN_FRONTEND noninteractive @@ -14,17 +14,15 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio RUN apt-get update && apt-get install -y --allow-unauthenticated ca-certificates gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic #installing php repo -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys AC0E47584A7A714D RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4F4EA0AAE5267A6C -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A1715D88E1DF1F24 -RUN echo "deb http://ppa.launchpad.net/ondrej/nginx-mainline/ubuntu cosmic main" >> /etc/apt/sources.list +RUN sh -c 'echo "deb http://ppa.launchpad.net/ondrej/nginx-mainline/ubuntu cosmic main" > /etc/apt/sources.list.d/nginx.list' +RUN sh -c 'echo "deb-src http://ppa.launchpad.net/ondrej/nginx-mainline/ubuntu cosmic main" >> /etc/apt/sources.list.d/nginx.list' #installing utils RUN apt-get update && apt-get install -y --allow-unauthenticated htop mc tmux iftop cmatrix wget iputils-ping - #installing packages -RUN apt-get install -y --allow-unauthenticated openssl nginx libnginx-mod-http-cache-purge libnginx-mod-http-dav-ext libnginx-mod-http-geoip libnginx-mod-http-headers-more-filter libnginx-mod-http-lua libnginx-mod-http-uploadprogress libnginx-mod-mail libnginx-mod-stream libnginx-mod-http-xslt-filter && \ +RUN apt-get install -y --allow-unauthenticated nginx-full openssl libnginx-mod-http-cache-purge libnginx-mod-http-dav-ext libnginx-mod-http-geoip libnginx-mod-http-headers-more-filter libnginx-mod-http-lua libnginx-mod-http-uploadprogress libnginx-mod-mail libnginx-mod-stream libnginx-mod-http-xslt-filter && \ rm -rf /var/lib/apt/lists/* RUN ln -sf /dev/stdout /var/log/nginx/access.log && \ @@ -36,9 +34,7 @@ RUN sudo locale-gen RUN localedef en_US.UTF-8 -i en_US -f UTF-8 RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 - +#final config VOLUME ["/var/cache/nginx"] - EXPOSE 80 443 - CMD ["nginx", "-g", "daemon off;"] diff --git a/balancer/sources.list b/balancer/sources.list index b657a17f7..ce94b9c5d 100644 --- a/balancer/sources.list +++ b/balancer/sources.list @@ -1,14 +1,8 @@ -deb http://mirror.yandex.ru/ubuntu/ cosmic main multiverse restricted universe -deb http://mirror.yandex.ru/ubuntu/ cosmic-backports main multiverse restricted universe -deb http://mirror.yandex.ru/ubuntu/ cosmic-proposed main multiverse restricted universe -deb http://mirror.yandex.ru/ubuntu/ cosmic-security main multiverse restricted universe -deb http://mirror.yandex.ru/ubuntu/ cosmic-updates main multiverse restricted universe -deb http://archive.canonical.com/ubuntu cosmic partner - - -deb-src http://mirror.yandex.ru/ubuntu/ cosmic main multiverse restricted universe -deb-src http://mirror.yandex.ru/ubuntu/ cosmic-backports main multiverse restricted universe -deb-src http://mirror.yandex.ru/ubuntu/ cosmic-proposed main multiverse restricted universe -deb-src http://mirror.yandex.ru/ubuntu/ cosmic-security main multiverse restricted universe -deb-src http://mirror.yandex.ru/ubuntu/ cosmic-updates main multiverse restricted universe -deb-src http://archive.canonical.com/ubuntu cosmic partner +deb http://mirror.yandex.ru/debian/ buster main contrib non-free +deb-src http://mirror.yandex.ru/debian/ buster main contrib non-free +deb http://mirror.yandex.ru/debian/ buster-updates main contrib non-free +deb-src http://mirror.yandex.ru/debian/ buster-updates main contrib non-free +deb http://mirror.yandex.ru/debian/ buster-proposed-updates main contrib non-free +deb-src http://mirror.yandex.ru/debian/ buster-proposed-updates main contrib non-free +deb http://security.debian.org/debian-security/ buster/updates main contrib non-free +deb-src http://security.debian.org/debian-security/ buster/updates main contrib non-free