From b751dc74ddf297661f6fba429346140090cbe70e Mon Sep 17 00:00:00 2001 From: Mr Bot Date: Mon, 4 Mar 2019 23:48:33 +0300 Subject: [PATCH] updates 03/04/2019 --- README.md | 21 +++++++++++++-------- balancer/Dockerfile | 14 +++++++------- bitbucket/latest/Dockerfile | 2 +- jira/latest/Dockerfile | 2 +- jira/latest/Makefile | 2 +- websites/Dockerfile | 4 ++-- 6 files changed, 25 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 49cbee10c..eb7755ac9 100644 --- a/README.md +++ b/README.md @@ -6,15 +6,20 @@ | 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/6.0.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/) | Just generic `Jira Software` server. You can install servicedesk\core. -| ![Atlassian Confluence](https://img.shields.io/badge/Atlassian-Confluence-brightgreen.svg?style=popout-square) | [![Atlassian Confluence](https://img.shields.io/badge/6.14.1-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/8.0.0-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. +| [![Atlassian Bitbucket](https://img.shields.io/badge/Atlassian-Bitbucket-brightgreen.svg?style=popout-square)](https://www.atlassian.com/software/bitbucket/download) | [![Atlassian Bitbucket](https://img.shields.io/badge/6.0.1-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/) | Just generic `Jira Software` server. You can install servicedesk\core. +| [![Atlassian Confluence](https://img.shields.io/badge/Atlassian-Confluence-brightgreen.svg?style=popout-square)](https://www.atlassian.com/software/confluence/download) | [![Atlassian Confluence](https://img.shields.io/badge/6.14.1-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)](https://www.atlassian.com/software/bitbucket/download) | [![Atlassian Jira](https://img.shields.io/badge/8.0.0-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)](https://deb.sury.org/) | [![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)](https://deb.sury.org/) | [![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)](https://deb.sury.org/) | [![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. ## Changelog -* 02/19/2018 +* 03/04/2019 + * nginx-full -> nginx-extras `1.15.9` + * bitbucket `6.0.1` + * jira `8.0.1` + * various script fixes +* 02/19/2019 * jira `8.0.0` * 02/14/2019 * bitbucket `5.16.0` -> `6.0.0` @@ -22,7 +27,7 @@ * 02/12/2019 * added curl binary to `balancer` and `websites` containers. * added support for ioncube for php7.3 (enabled by default) in `websites` container. -* 02/11/2019 - updated *balancer* and *websites* images. +* 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` diff --git a/balancer/Dockerfile b/balancer/Dockerfile index 29abd0339..05376e3e5 100644 --- a/balancer/Dockerfile +++ b/balancer/Dockerfile @@ -10,18 +10,18 @@ COPY locale.gen /etc/locale.gen # fix errors RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update && apt-get install -y --allow-unauthenticated ca-certificates gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic +RUN apt-get update && apt-get install -y --allow-unauthenticated ca-certificates gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl + +#installing nginx repo +RUN wget -O /etc/apt/trusted.gpg.d/nginx-mainline.gpg https://packages.sury.org/nginx-mainline/apt.gpg +RUN sh -c 'echo "deb https://packages.sury.org/nginx-mainline/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/nginx-mainline.list' -#installing php repo -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4F4EA0AAE5267A6C -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 curl +RUN apt-get update && apt-get install -y --allow-unauthenticated htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx #installing packages -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 && \ +RUN apt-get install -y --allow-unauthenticated libgd-tools geoip-bin nginx-doc ssl-cert nginx-extras 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 && \ diff --git a/bitbucket/latest/Dockerfile b/bitbucket/latest/Dockerfile index 3c6667fbb..d9e58272d 100644 --- a/bitbucket/latest/Dockerfile +++ b/bitbucket/latest/Dockerfile @@ -29,7 +29,7 @@ RUN chmod +x /tini COPY entrypoint.sh /entrypoint.sh -ARG BITBUCKET_VERSION=6.0.0 +ARG BITBUCKET_VERSION=6.0.1 ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz RUN mkdir -p ${BITBUCKET_INSTALL_DIR} \ diff --git a/jira/latest/Dockerfile b/jira/latest/Dockerfile index 56e5b7a74..092f33199 100644 --- a/jira/latest/Dockerfile +++ b/jira/latest/Dockerfile @@ -23,7 +23,7 @@ RUN apk add --no-cache wget curl openssh bash procps openssl perl ttf-dejavu tin COPY entrypoint.sh /entrypoint.sh -ARG JIRA_VERSION=8.0.0 +ARG JIRA_VERSION=8.0.1 ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${JIRA_VERSION}.tar.gz COPY . /tmp diff --git a/jira/latest/Makefile b/jira/latest/Makefile index 9977f28f7..81720e657 100644 --- a/jira/latest/Makefile +++ b/jira/latest/Makefile @@ -1,4 +1,4 @@ all: jira jira: - docker build --no-cache -t epicmorg/jira . + docker build --no-cache -t epicmorg/jira . \ No newline at end of file diff --git a/websites/Dockerfile b/websites/Dockerfile index d8a0700fc..79d00beab 100644 --- a/websites/Dockerfile +++ b/websites/Dockerfile @@ -10,14 +10,14 @@ COPY locale.gen /etc/locale.gen # fix errors RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update && apt-get install -y --allow-unauthenticated ca-certificates gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic +RUN apt-get update && apt-get install -y --allow-unauthenticated ca-certificates gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl #installing php repo RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys AC0E47584A7A714D RUN sh -c 'echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' #installing utils -RUN apt-get update && apt-get install -y --allow-unauthenticated htop mc tmux iftop cmatrix wget iputils-ping curl +RUN apt-get update && apt-get install -y --allow-unauthenticated htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx # Install base packages RUN apt-get install -y --allow-unauthenticated php7.3-ldap php7.3-dev php7.3 git php7.3-mail sendmail php7.3-mailparse php7.3-soap php7.3-mysql php7.3-memcached php7.3-memcache php7.3-igbinary libmemcached-dev php7.3-curl php7.3-gd php7.3-intl php7.3-zip php7.3-bcmath php7.3-fpm php-pear php7.3-imap php7.3-pspell php7.3-recode php7.3-sqlite3 php7.3-tidy php7.3-xmlrpc php7.3-xml php7.3-mbstring php7.3-gettext php7.3-apcu php7.3-cli php7.3-common php7.3-cgi php7.3-json php7.3-readline php7.3-enchant php7.3-ssh2 php7.3-oauth php7.3-gettext php7.3-gmagick php7.3-gnupg php7.3-redis php7.3-smbclient php7.3-yaml php7.3-geoip apache2 libapache2-mod-php7.3 apache2-utils libapache2-mod-webauth libapache2-mod-xforward libapache2-mod-webauth libapache2-mod-webauth libapache2-mod-security2 && \