diff --git a/README.md b/README.md index eb7755ac9..33d5f2342 100644 --- a/README.md +++ b/README.md @@ -14,10 +14,15 @@ | [![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 +* 03/06/2019 + * bitbucket `6.1.0` + * jira `8.0.2` + * migrationg from alpine to debian contaiers: + * jira * 03/04/2019 * nginx-full -> nginx-extras `1.15.9` * bitbucket `6.0.1` - * jira `8.0.1` + * jira `8.0.1` (bugs!) * various script fixes * 02/19/2019 * jira `8.0.0` diff --git a/bitbucket/latest/Dockerfile b/bitbucket/latest/Dockerfile index d9e58272d..a63983d0d 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.1 +ARG BITBUCKET_VERSION=6.1.0 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 092f33199..a140a4168 100644 --- a/jira/latest/Dockerfile +++ b/jira/latest/Dockerfile @@ -1,8 +1,22 @@ -FROM anapsix/alpine-java:8_jdk +#FROM anapsix/alpine-java:8_jdk +FROM debian:buster + MAINTAINER Atlassian Jira Server Team -ENV RUN_USER daemon -ENV RUN_GROUP daemon +ENV DEBIAN_FRONTEND noninteractive + +#editing sources list +RUN rm /etc/apt/sources.list +COPY sources.list /etc/apt/sources.list +#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 openjdk-8-jdk openjdk-8-jre locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux + + +ENV RUN_USER bin +ENV RUN_GROUP bin # https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files ENV JIRA_HOME /var/atlassian/application-data/jira @@ -16,14 +30,15 @@ EXPOSE 8080 WORKDIR $JIRA_HOME CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/sbin/tini", "--"] +ENTRYPOINT ["/usr/bin/tini", "--"] + +#installing utils +RUN apt-get update && apt-get install -y --allow-unauthenticated htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx -RUN apk add --no-cache wget curl openssh bash procps openssl perl ttf-dejavu tini util-linux mc htop \ - && rm -rf /var/lib/{apt,dpkg,cache,log}/ /tmp/* /var/tmp/* COPY entrypoint.sh /entrypoint.sh -ARG JIRA_VERSION=8.0.1 +ARG JIRA_VERSION=8.0.2 ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${JIRA_VERSION}.tar.gz COPY . /tmp