From 03fc029ef1abcb5d95642df03af38511fe413f1e Mon Sep 17 00:00:00 2001 From: Odmin Date: Sun, 29 Dec 2019 18:37:03 +0300 Subject: [PATCH 1/9] pre-1 --- .travis.yml | 20 + .../confluence/7.1.2/.docker-repository.yml | 1 + atlassian/confluence/7.1.2/.dockerignore | 3 + atlassian/confluence/7.1.2/Dockerfile | 46 ++ atlassian/confluence/7.1.2/Makefile | 5 + atlassian/confluence/7.1.2/README.md | 131 +++++ atlassian/confluence/7.1.2/entrypoint.sh | 39 ++ .../confluence/7.2.0/.docker-repository.yml | 1 + atlassian/confluence/7.2.0/.dockerignore | 3 + atlassian/confluence/7.2.0/Dockerfile | 46 ++ atlassian/confluence/7.2.0/Makefile | 5 + atlassian/confluence/7.2.0/README.md | 131 +++++ atlassian/confluence/7.2.0/entrypoint.sh | 39 ++ atlassian/confluence/latest/Dockerfile | 2 +- atlassian/jira/8.5.2/.docker-repository.yml | 1 + atlassian/jira/8.5.2/.dockerignore | 3 + atlassian/jira/8.5.2/Dockerfile | 47 ++ atlassian/jira/8.5.2/Makefile | 4 + atlassian/jira/8.5.2/README.md | 151 ++++++ atlassian/jira/8.5.2/entrypoint.sh | 89 ++++ epicmorg/prod-jdk8/.docker-repository.yml | 1 + epicmorg/prod-jdk8/.dockerignore | 3 + epicmorg/prod-jdk8/Dockerfile | 85 +++ epicmorg/prod-jdk8/Makefile | 5 + epicmorg/prod-jdk8/deb-multimedia-keyring.gpg | Bin 0 -> 7607 bytes epicmorg/prod-jdk8/locale.gen | 12 + epicmorg/prod-jdk8/locale.gen.full | 496 ++++++++++++++++++ epicmorg/prod-jdk8/sources.list | 17 + 28 files changed, 1385 insertions(+), 1 deletion(-) create mode 100644 atlassian/confluence/7.1.2/.docker-repository.yml create mode 100644 atlassian/confluence/7.1.2/.dockerignore create mode 100644 atlassian/confluence/7.1.2/Dockerfile create mode 100644 atlassian/confluence/7.1.2/Makefile create mode 100644 atlassian/confluence/7.1.2/README.md create mode 100755 atlassian/confluence/7.1.2/entrypoint.sh create mode 100644 atlassian/confluence/7.2.0/.docker-repository.yml create mode 100644 atlassian/confluence/7.2.0/.dockerignore create mode 100644 atlassian/confluence/7.2.0/Dockerfile create mode 100644 atlassian/confluence/7.2.0/Makefile create mode 100644 atlassian/confluence/7.2.0/README.md create mode 100755 atlassian/confluence/7.2.0/entrypoint.sh create mode 100644 atlassian/jira/8.5.2/.docker-repository.yml create mode 100644 atlassian/jira/8.5.2/.dockerignore create mode 100644 atlassian/jira/8.5.2/Dockerfile create mode 100644 atlassian/jira/8.5.2/Makefile create mode 100644 atlassian/jira/8.5.2/README.md create mode 100755 atlassian/jira/8.5.2/entrypoint.sh create mode 100644 epicmorg/prod-jdk8/.docker-repository.yml create mode 100644 epicmorg/prod-jdk8/.dockerignore create mode 100644 epicmorg/prod-jdk8/Dockerfile create mode 100644 epicmorg/prod-jdk8/Makefile create mode 100644 epicmorg/prod-jdk8/deb-multimedia-keyring.gpg create mode 100644 epicmorg/prod-jdk8/locale.gen create mode 100644 epicmorg/prod-jdk8/locale.gen.full create mode 100644 epicmorg/prod-jdk8/sources.list diff --git a/.travis.yml b/.travis.yml index 20c2ea471..fe859382a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -458,6 +458,20 @@ matrix: - docker push epicmorg/confluence:7.1.1 + - name: Confluence 7.1.2 + script: + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - docker build --compress -t epicmorg/confluence:7.1.2 atlassian/confluence/7.1.2 + - docker push epicmorg/confluence:7.1.2 + + + - name: Confluence 7.2.0 + script: + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - docker build --compress -t epicmorg/confluence:7.2.0 atlassian/confluence/7.2.0 + - docker push epicmorg/confluence:7.2.0 + + ######################################### #### Our Jira images ######################################### @@ -689,6 +703,12 @@ matrix: - docker build --compress -t epicmorg/jira:8.5.1 atlassian/jira/8.5.1 - docker push epicmorg/jira:8.5.1 + - name: Jira 8.5.2 + script: + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - docker build --compress -t epicmorg/jira:8.5.2 atlassian/jira/8.5.2 + - docker push epicmorg/jira:8.5.2 + ######################################### #### Our minor priority images ######################################### diff --git a/atlassian/confluence/7.1.2/.docker-repository.yml b/atlassian/confluence/7.1.2/.docker-repository.yml new file mode 100644 index 000000000..efb9f8b2d --- /dev/null +++ b/atlassian/confluence/7.1.2/.docker-repository.yml @@ -0,0 +1 @@ +repository: epicmorg/confluence diff --git a/atlassian/confluence/7.1.2/.dockerignore b/atlassian/confluence/7.1.2/.dockerignore new file mode 100644 index 000000000..99176b278 --- /dev/null +++ b/atlassian/confluence/7.1.2/.dockerignore @@ -0,0 +1,3 @@ +.git +scripts +.idea \ No newline at end of file diff --git a/atlassian/confluence/7.1.2/Dockerfile b/atlassian/confluence/7.1.2/Dockerfile new file mode 100644 index 000000000..4c9103bec --- /dev/null +++ b/atlassian/confluence/7.1.2/Dockerfile @@ -0,0 +1,46 @@ +FROM epicmorg/prod +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## +ARG CONFLUENCE_VERSION=7.1.2 +ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html +ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence +ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence + +VOLUME ["${CONFLUENCE_HOME}"] +WORKDIR $CONFLUENCE_HOME + +# Expose HTTP and Synchrony ports +EXPOSE 8090 +EXPOSE 8091 + +################################################################## +# Installing +################################################################## +RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ + && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_INSTALL_DIR}/ \ + && sed -i -e 's/-Xms\([0-9]\+[kmg]\) -Xmx\([0-9]\+[kmg]\)/-Xms\${JVM_MINIMUM_MEMORY:=\1} -Xmx\${JVM_MAXIMUM_MEMORY:=\2} \${JVM_SUPPORT_RECOMMENDED_ARGS} -Dconfluence.home=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \ + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/atlassian/confluence/7.1.2/Makefile b/atlassian/confluence/7.1.2/Makefile new file mode 100644 index 000000000..f1f12c6f2 --- /dev/null +++ b/atlassian/confluence/7.1.2/Makefile @@ -0,0 +1,5 @@ +all: confl + +confl: + docker build --compress -t epicmorg/confluence:7.1.2 . + docker push epicmorg/confluence:7.1.2 diff --git a/atlassian/confluence/7.1.2/README.md b/atlassian/confluence/7.1.2/README.md new file mode 100644 index 000000000..7e5b92f37 --- /dev/null +++ b/atlassian/confluence/7.1.2/README.md @@ -0,0 +1,131 @@ +![Atlassian Confluence Server](https://www.atlassian.com/dam/wac/legacy/confluence_logo_landing.png) + +Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence. + +Learn more about Confluence Server: + +You can find the repository for this Dockerfile at + +# Overview + +This Docker container makes it easy to get an instance of Confluence up and running. + +# Quick Start + +For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data +(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume): + +Start Atlassian Confluence Server: + + $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence + + +**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)* + +Please ensure your container has the necessary resources allocated to it. +We recommend 2GiB of memory allocated to accommodate the application server. +See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information. + + +_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._ + +## Memory / Heap Size + +If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables. + +* `JVM_MINIMUM_MEMORY` (default: 1024m) + + The minimum heap size of the JVM + +* `JVM_MAXIMUM_MEMORY` (default: 1024m) + + The maximum heap size of the JVM + +## Reverse Proxy Settings + +If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables. + +* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE) + + The reverse proxy's fully qualified hostname. + +* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE) + + The reverse proxy's port number via which Confluence is accessed. + +* `CATALINA_CONNECTOR_SCHEME` (default: http) + + The protocol via which Confluence is accessed. + +* `CATALINA_CONNECTOR_SECURE` (default: false) + + Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'. + +## JVM configuration + +If you need to pass additional JVM arguments to Confluence such as specifying a custom trust store, you can add them via the below environment variable + +* `JVM_SUPPORT_RECOMMENDED_ARGS` + + Additional JVM arguments for Confluence + +Example: + + $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence + + +# Upgrade + +To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence` +container and start a new one based on a more recent image: + + $> docker stop confluence + $> docker rm confluence + $> docker run ... (see above) + +As your data is stored in the data volume directory on the host, it will still +be available after the upgrade. + +_Note: Please make sure that you **don't** accidentally remove the `confluence` +container and its volumes using the `-v` option._ + +# Backup + +For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above). + +Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database. + +Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore) + +# Versioning + +The `latest` tag matches the most recent release of Atlassian Confluence Server. +So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available. + +Alternatively, you can use a specific minor version of Confluence Server by using a version number +tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that +is available. + +## Versions available + +* `epicmorg/confluence:latest` +* `epicmorg/confluence:5.6.4` +* `epicmorg/confluence:5.10.8` + +# Known Problems +In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error: + Error writing state to confluence.cfg.xml +com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory. + +See https://github.com/docker/docker/issues/4023 for details. + +To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue. + +# Support + +This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production. + +To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info. + +For product support go to [support.atlassian.com](http://support.atlassian.com). + diff --git a/atlassian/confluence/7.1.2/entrypoint.sh b/atlassian/confluence/7.1.2/entrypoint.sh new file mode 100755 index 000000000..250fc031a --- /dev/null +++ b/atlassian/confluence/7.1.2/entrypoint.sh @@ -0,0 +1,39 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export CATALINA_OPTS + + +# Start Confluence as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${CONFLUENCE_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${CONFLUENCE_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${CONFLUENCE_HOME}" + fi + # Now drop privileges + exec su -s /bin/bash "${RUN_USER}" -c "$CONFLUENCE_INSTALL_DIR/bin/start-confluence.sh $@" +else + exec "$CONFLUENCE_INSTALL_DIR/bin/start-confluence.sh" "$@" +fi diff --git a/atlassian/confluence/7.2.0/.docker-repository.yml b/atlassian/confluence/7.2.0/.docker-repository.yml new file mode 100644 index 000000000..efb9f8b2d --- /dev/null +++ b/atlassian/confluence/7.2.0/.docker-repository.yml @@ -0,0 +1 @@ +repository: epicmorg/confluence diff --git a/atlassian/confluence/7.2.0/.dockerignore b/atlassian/confluence/7.2.0/.dockerignore new file mode 100644 index 000000000..99176b278 --- /dev/null +++ b/atlassian/confluence/7.2.0/.dockerignore @@ -0,0 +1,3 @@ +.git +scripts +.idea \ No newline at end of file diff --git a/atlassian/confluence/7.2.0/Dockerfile b/atlassian/confluence/7.2.0/Dockerfile new file mode 100644 index 000000000..92ee98e39 --- /dev/null +++ b/atlassian/confluence/7.2.0/Dockerfile @@ -0,0 +1,46 @@ +FROM epicmorg/prod +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## +ARG CONFLUENCE_VERSION=7.2.0 +ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html +ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence +ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence + +VOLUME ["${CONFLUENCE_HOME}"] +WORKDIR $CONFLUENCE_HOME + +# Expose HTTP and Synchrony ports +EXPOSE 8090 +EXPOSE 8091 + +################################################################## +# Installing +################################################################## +RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ + && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_INSTALL_DIR}/ \ + && sed -i -e 's/-Xms\([0-9]\+[kmg]\) -Xmx\([0-9]\+[kmg]\)/-Xms\${JVM_MINIMUM_MEMORY:=\1} -Xmx\${JVM_MAXIMUM_MEMORY:=\2} \${JVM_SUPPORT_RECOMMENDED_ARGS} -Dconfluence.home=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \ + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/atlassian/confluence/7.2.0/Makefile b/atlassian/confluence/7.2.0/Makefile new file mode 100644 index 000000000..63c528903 --- /dev/null +++ b/atlassian/confluence/7.2.0/Makefile @@ -0,0 +1,5 @@ +all: confl + +confl: + docker build --compress -t epicmorg/confluence:7.2.0 . + docker push epicmorg/confluence:7.2.0 diff --git a/atlassian/confluence/7.2.0/README.md b/atlassian/confluence/7.2.0/README.md new file mode 100644 index 000000000..7e5b92f37 --- /dev/null +++ b/atlassian/confluence/7.2.0/README.md @@ -0,0 +1,131 @@ +![Atlassian Confluence Server](https://www.atlassian.com/dam/wac/legacy/confluence_logo_landing.png) + +Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence. + +Learn more about Confluence Server: + +You can find the repository for this Dockerfile at + +# Overview + +This Docker container makes it easy to get an instance of Confluence up and running. + +# Quick Start + +For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data +(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume): + +Start Atlassian Confluence Server: + + $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence + + +**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)* + +Please ensure your container has the necessary resources allocated to it. +We recommend 2GiB of memory allocated to accommodate the application server. +See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information. + + +_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._ + +## Memory / Heap Size + +If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables. + +* `JVM_MINIMUM_MEMORY` (default: 1024m) + + The minimum heap size of the JVM + +* `JVM_MAXIMUM_MEMORY` (default: 1024m) + + The maximum heap size of the JVM + +## Reverse Proxy Settings + +If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables. + +* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE) + + The reverse proxy's fully qualified hostname. + +* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE) + + The reverse proxy's port number via which Confluence is accessed. + +* `CATALINA_CONNECTOR_SCHEME` (default: http) + + The protocol via which Confluence is accessed. + +* `CATALINA_CONNECTOR_SECURE` (default: false) + + Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'. + +## JVM configuration + +If you need to pass additional JVM arguments to Confluence such as specifying a custom trust store, you can add them via the below environment variable + +* `JVM_SUPPORT_RECOMMENDED_ARGS` + + Additional JVM arguments for Confluence + +Example: + + $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence + + +# Upgrade + +To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence` +container and start a new one based on a more recent image: + + $> docker stop confluence + $> docker rm confluence + $> docker run ... (see above) + +As your data is stored in the data volume directory on the host, it will still +be available after the upgrade. + +_Note: Please make sure that you **don't** accidentally remove the `confluence` +container and its volumes using the `-v` option._ + +# Backup + +For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above). + +Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database. + +Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore) + +# Versioning + +The `latest` tag matches the most recent release of Atlassian Confluence Server. +So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available. + +Alternatively, you can use a specific minor version of Confluence Server by using a version number +tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that +is available. + +## Versions available + +* `epicmorg/confluence:latest` +* `epicmorg/confluence:5.6.4` +* `epicmorg/confluence:5.10.8` + +# Known Problems +In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error: + Error writing state to confluence.cfg.xml +com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory. + +See https://github.com/docker/docker/issues/4023 for details. + +To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue. + +# Support + +This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production. + +To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info. + +For product support go to [support.atlassian.com](http://support.atlassian.com). + diff --git a/atlassian/confluence/7.2.0/entrypoint.sh b/atlassian/confluence/7.2.0/entrypoint.sh new file mode 100755 index 000000000..250fc031a --- /dev/null +++ b/atlassian/confluence/7.2.0/entrypoint.sh @@ -0,0 +1,39 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export CATALINA_OPTS + + +# Start Confluence as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${CONFLUENCE_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${CONFLUENCE_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${CONFLUENCE_HOME}" + fi + # Now drop privileges + exec su -s /bin/bash "${RUN_USER}" -c "$CONFLUENCE_INSTALL_DIR/bin/start-confluence.sh $@" +else + exec "$CONFLUENCE_INSTALL_DIR/bin/start-confluence.sh" "$@" +fi diff --git a/atlassian/confluence/latest/Dockerfile b/atlassian/confluence/latest/Dockerfile index b3d10ee44..92ee98e39 100644 --- a/atlassian/confluence/latest/Dockerfile +++ b/atlassian/confluence/latest/Dockerfile @@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=7.1.1 +ARG CONFLUENCE_VERSION=7.2.0 ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz ################################################################## diff --git a/atlassian/jira/8.5.2/.docker-repository.yml b/atlassian/jira/8.5.2/.docker-repository.yml new file mode 100644 index 000000000..8dc515604 --- /dev/null +++ b/atlassian/jira/8.5.2/.docker-repository.yml @@ -0,0 +1 @@ +repository: epicmorg/jira diff --git a/atlassian/jira/8.5.2/.dockerignore b/atlassian/jira/8.5.2/.dockerignore new file mode 100644 index 000000000..99176b278 --- /dev/null +++ b/atlassian/jira/8.5.2/.dockerignore @@ -0,0 +1,3 @@ +.git +scripts +.idea \ No newline at end of file diff --git a/atlassian/jira/8.5.2/Dockerfile b/atlassian/jira/8.5.2/Dockerfile new file mode 100644 index 000000000..b0f6a23eb --- /dev/null +++ b/atlassian/jira/8.5.2/Dockerfile @@ -0,0 +1,47 @@ +FROM epicmorg/prod +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## +ARG JIRA_VERSION=8.5.2 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${JIRA_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +RUN mkdir -p ${JIRA_INSTALL_DIR} \ + && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ + && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ + && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ + && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ + && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ + && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/atlassian/jira/8.5.2/Makefile b/atlassian/jira/8.5.2/Makefile new file mode 100644 index 000000000..c230d45b7 --- /dev/null +++ b/atlassian/jira/8.5.2/Makefile @@ -0,0 +1,4 @@ +all: jr + +jr: + docker build --compress -t epicmorg/jira:8.5.2 . diff --git a/atlassian/jira/8.5.2/README.md b/atlassian/jira/8.5.2/README.md new file mode 100644 index 000000000..4cab96ead --- /dev/null +++ b/atlassian/jira/8.5.2/README.md @@ -0,0 +1,151 @@ +![Atlassian JIRA](https://www.atlassian.com/dam/wac/legacy/jira_logo_landing.png) + +JIRA Software is a software development tool used by agile teams. + +Learn more about JIRA Software: + +# Overview + +This Docker container makes it easy to get an instance of JIRA Software up and running. + +# Quick Start + +For the `JIRA_HOME` directory that is used to store application data (amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/engine/tutorials/dockervolumes/#/data-volumes), or via a named volume if using a docker version >= 1.9. + +To get started you can use a data volume, or named volumes. In this example we'll use named volumes. + + $> docker volume create --name jiraVolume + $> docker run -v jiraVolume:/var/atlassian/application-data/jira --name="jira" -d -p 8080:8080 epicmorg/jira + + +**Success**. JIRA is now available on [http://localhost:8080](http://localhost:8080)* + +Please ensure your container has the necessary resources allocated to it. We recommend 2GiB of memory allocated to accommodate the application server. See [System Requirements](https://confluence.atlassian.com/adminjiraserver071/jira-applications-installation-requirements-802592164.html) for further information. + + +_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8080` instead._ + +## Memory / Heap Size + +If you need to override JIRA's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables. + +* `JVM_MINIMUM_MEMORY` (default: 384m) + + The minimum heap size of the JVM + +* `JVM_MAXIMUM_MEMORY` (default: 768m) + + The maximum heap size of the JVM + +## Reverse Proxy Settings + +If JIRA is run behind a reverse proxy server as [described here](https://confluence.atlassian.com/adminjiraserver072/integrating-jira-with-apache-using-ssl-828788158.html), then you need to specify extra options to make JIRA aware of the setup. They can be controlled via the below environment variables. + +* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE) + + The reverse proxy's fully qualified hostname. + +* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE) + + The reverse proxy's port number via which JIRA is accessed. + +* `CATALINA_CONNECTOR_SCHEME` (default: http) + + The protocol via which JIRA is accessed. + +* `CATALINA_CONNECTOR_SECURE` (default: false) + + Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'. + +## JVM configuration + +If you need to pass additional JVM arguments to JIRA, such as specifying a custom trust store, you can add them via the below environment variable + +* `JVM_SUPPORT_RECOMMENDED_ARGS` + + Additional JVM arguments for JIRA + +Example: + + $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/jira/cacerts -v jiraVolume:/var/atlassian/application-data/jira --name="jira" -d -p 8080:8080 epicmorg/jira + +## Data Center configuration + +This docker image can be run as part of a [Data Center](https://confluence.atlassian.com/enterprise/jira-data-center-472219731.html) cluster. You can specify the following properties to start Jira as a Data Center node, instead of manually configuring a cluster.properties file, See [Installing Jira Data Center](https://confluence.atlassian.com/adminjiraserver071/installing-jira-data-center-802592197.html) for more information on each property and its possible configuration. + +* `CLUSTERED` (default: false) + + Set 'true' to enable clustering configuration to be used. This will create a **cluster.properties** file inside the container's `$JIRA_HOME` directory. + +* `JIRA_NODE_ID` (default: jira_node_) + + The unique ID for the node. By default, this will include the first eight characters of the Docker container ID, but can be overridden with a custom value. + +* `JIRA_SHARED_HOME` (default: $JIRA_HOME/shared) + + The location of the shared home directory for all Jira nodes. + +* `EHCACHE_PEER_DISCOVERY` (default: default) + + Describes how nodes find each other. + +* `EHCACHE_LISTENER_HOSTNAME` (default: NONE) + + The hostname of the current node for cache communication. Jira Data Center will resolve this this internally if the parameter isn't set. + +* `EHCACHE_LISTENER_PORT` (default: 40001) + + The port the node is going to be listening to. + +* `EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS` (default: 2000) + + The default timeout for the Ehcache listener. + +* `EHCACHE_MULTICAST_ADDRESS` (default: NONE) + + A valid multicast group address. Required when EHCACHE_PEER_DISCOVERY is set to 'automatic' insted of 'default'. + +* `EHCACHE_MULTICAST_PORT` (default: NONE) + + The dedicated port for the multicast heartbeat traffic.Required when EHCACHE_PEER_DISCOVERY is set to 'automatic' insted of 'default'. + +* `EHCACHE_MULTICAST_TIMETOLIVE` (default: NONE) + + A value between 0 and 255 which determines how far the packets will propagate. Required when EHCACHE_PEER_DISCOVERY is set to 'automatic' insted of 'default'. + +* `EHCACHE_MULTICAST_HOSTNAME` (default: NONE) + + The hostname or IP of the interface to be used for sending and receiving multicast packets. Required when EHCACHE_PEER_DISCOVERY is set to 'automatic' insted of 'default'. + +# Upgrade + +To upgrade to a more recent version of JIRA you can simply stop the `jira` container and start a new one based on a more recent image: + + $> docker stop jira + $> docker rm jira + $> docker run ... (See above) + +As your data is stored in the data volume directory on the host it will still be available after the upgrade. + +_Note: Please make sure that you **don't** accidentally remove the `jira` container and its volumes using the `-v` option._ + +# Backup + +For evaluations you can use the built-in database that will store its files in the JIRA home directory. In that case it is sufficient to create a backup archive of the docker volume. + +If you're using an external database, you can configure JIRA to make a backup automatically each night. This will back up the current state, including the database to the `jiraVolume` docker volume, which can then be archived. Alternatively you can backup the database separately, and continue to create a backup archive of the docker volume to back up the JIRA Home directory. + +Read more about data recovery and backups: [https://confluence.atlassian.com/adminjiraserver071/backing-up-data-802592964.html](https://confluence.atlassian.com/adminjiraserver071/backing-up-data-802592964.html) + +# Versioning + +The `latest` tag matches the most recent release of Atlassian JIRA Software. Thus `epicmorg/jira:latest` will use the newest version of JIRA available. + +## Versions available + +* `epicmorg/jira:latest` +* `epicmorg/jira:7.10.0` + +# Support + +This Docker container is unsupported and is intended for illustration purposes only. diff --git a/atlassian/jira/8.5.2/entrypoint.sh b/atlassian/jira/8.5.2/entrypoint.sh new file mode 100755 index 000000000..50ee4ecd1 --- /dev/null +++ b/atlassian/jira/8.5.2/entrypoint.sh @@ -0,0 +1,89 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + # Now drop privileges + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" +else + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" +fi diff --git a/epicmorg/prod-jdk8/.docker-repository.yml b/epicmorg/prod-jdk8/.docker-repository.yml new file mode 100644 index 000000000..1e50bcd0a --- /dev/null +++ b/epicmorg/prod-jdk8/.docker-repository.yml @@ -0,0 +1 @@ +repository: epicmorg/prod diff --git a/epicmorg/prod-jdk8/.dockerignore b/epicmorg/prod-jdk8/.dockerignore new file mode 100644 index 000000000..99176b278 --- /dev/null +++ b/epicmorg/prod-jdk8/.dockerignore @@ -0,0 +1,3 @@ +.git +scripts +.idea \ No newline at end of file diff --git a/epicmorg/prod-jdk8/Dockerfile b/epicmorg/prod-jdk8/Dockerfile new file mode 100644 index 000000000..a9c4bef17 --- /dev/null +++ b/epicmorg/prod-jdk8/Dockerfile @@ -0,0 +1,85 @@ +FROM debian:buster +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# buster sources list +################################################################## +COPY deb-multimedia-keyring.gpg /etc/apt/trusted.gpg.d/deb-multimedia-keyring.gpg +RUN rm /etc/apt/sources.list +COPY sources.list /etc/apt/sources.list +RUN apt update && apt dist-upgrade -y +COPY locale.gen /etc/locale.gen + +################################################################## +# installing utils +################################################################## +RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ + apt-get update && \ + apt-get install -y --allow-unauthenticated \ + apt-transport-https \ + apt-utils \ + bash \ + ca-certificates \ + cmatrix \ + cmatrix-xfont \ + console-cyrillic \ + curl \ + ffmpeg \ + fontconfig \ + git \ + gnupg \ + gnupg2 \ + graphicsmagick \ + htop \ + iftop \ + iputils-ping \ + kmod \ + libzip4 \ + locales \ + lsb-release \ + lsof \ + lynx \ + mc \ + nano \ + nmap \ + openssl \ + perl \ + procps \ + rsync \ + screenfetch \ + smbclient \ + sudo \ + telnet \ + tini \ + tmux \ + tree \ + ttf-dejavu \ + util-linux \ + uuid-runtime \ + wget \ + zip + +################################################################## +# installing java8 +################################################################## +#RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 && \ +# echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list && \ +# apt-get update && \ +# apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer + +RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add - && \ + echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \ + apt-get update && \ + apt-get install -y --allow-unauthenticated adoptopenjdk-11-hotspot && \ + mkdir /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre && \ + ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/bin && \ + ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/lib + +################################################################## +# cleaninig up +################################################################## +RUN apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb diff --git a/epicmorg/prod-jdk8/Makefile b/epicmorg/prod-jdk8/Makefile new file mode 100644 index 000000000..9c6cb3e47 --- /dev/null +++ b/epicmorg/prod-jdk8/Makefile @@ -0,0 +1,5 @@ +all: emgprod +emgprod: + docker build --compress -t epicmorg/prod . + docker push epicmorg/prod + diff --git a/epicmorg/prod-jdk8/deb-multimedia-keyring.gpg b/epicmorg/prod-jdk8/deb-multimedia-keyring.gpg new file mode 100644 index 0000000000000000000000000000000000000000..a4f2b1006e8a1c556adb8801ed5ac01fc4124d96 GIT binary patch literal 7607 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 Date: Mon, 13 Jan 2020 19:08:38 +0300 Subject: [PATCH 2/9] separated base containers to pure,jdk8 and jdk11 --- .travis.yml | 32 +- .../devel/{ => jdk11}/.docker-repository.yml | 0 epicmorg/devel/{ => jdk11}/.dockerignore | 0 epicmorg/devel/jdk11/Dockerfile | 23 + epicmorg/devel/jdk11/Makefile | 5 + epicmorg/devel/jdk8/.docker-repository.yml | 1 + .../{prod-jdk8 => devel/jdk8}/.dockerignore | 0 epicmorg/devel/jdk8/Dockerfile | 20 + epicmorg/devel/jdk8/Makefile | 5 + epicmorg/devel/main/.docker-repository.yml | 1 + epicmorg/{prod => devel/main}/.dockerignore | 0 epicmorg/devel/{ => main}/Dockerfile | 0 epicmorg/devel/{ => main}/Makefile | 0 epicmorg/devel/{ => main}/sources.list | 0 epicmorg/prod/Dockerfile | 85 --- epicmorg/prod/Makefile | 5 - epicmorg/prod/deb-multimedia-keyring.gpg | Bin 7607 -> 0 bytes .../jdk11}/.docker-repository.yml | 0 epicmorg/prod/jdk11/.dockerignore | 3 + epicmorg/prod/jdk11/Dockerfile | 22 + epicmorg/prod/jdk11/Makefile | 5 + .../prod/{ => jdk8}/.docker-repository.yml | 0 epicmorg/prod/jdk8/.dockerignore | 3 + epicmorg/prod/jdk8/Dockerfile | 19 + epicmorg/prod/jdk8/Makefile | 5 + epicmorg/prod/locale.gen | 12 - epicmorg/prod/locale.gen.full | 496 ------------------ epicmorg/prod/main/.docker-repository.yml | 1 + epicmorg/prod/main/.dockerignore | 3 + epicmorg/{prod-jdk8 => prod/main}/Dockerfile | 16 - epicmorg/{prod-jdk8 => prod/main}/Makefile | 0 .../main}/deb-multimedia-keyring.gpg | Bin epicmorg/{prod-jdk8 => prod/main}/locale.gen | 0 .../{prod-jdk8 => prod/main}/locale.gen.full | 0 .../{prod-jdk8 => prod/main}/sources.list | 0 epicmorg/prod/sources.list | 17 - teamcity-agent/Dockerfile | 2 +- 37 files changed, 148 insertions(+), 633 deletions(-) rename epicmorg/devel/{ => jdk11}/.docker-repository.yml (100%) rename epicmorg/devel/{ => jdk11}/.dockerignore (100%) create mode 100644 epicmorg/devel/jdk11/Dockerfile create mode 100644 epicmorg/devel/jdk11/Makefile create mode 100644 epicmorg/devel/jdk8/.docker-repository.yml rename epicmorg/{prod-jdk8 => devel/jdk8}/.dockerignore (100%) create mode 100644 epicmorg/devel/jdk8/Dockerfile create mode 100644 epicmorg/devel/jdk8/Makefile create mode 100644 epicmorg/devel/main/.docker-repository.yml rename epicmorg/{prod => devel/main}/.dockerignore (100%) rename epicmorg/devel/{ => main}/Dockerfile (100%) rename epicmorg/devel/{ => main}/Makefile (100%) rename epicmorg/devel/{ => main}/sources.list (100%) delete mode 100644 epicmorg/prod/Dockerfile delete mode 100644 epicmorg/prod/Makefile delete mode 100644 epicmorg/prod/deb-multimedia-keyring.gpg rename epicmorg/{prod-jdk8 => prod/jdk11}/.docker-repository.yml (100%) create mode 100644 epicmorg/prod/jdk11/.dockerignore create mode 100644 epicmorg/prod/jdk11/Dockerfile create mode 100644 epicmorg/prod/jdk11/Makefile rename epicmorg/prod/{ => jdk8}/.docker-repository.yml (100%) create mode 100644 epicmorg/prod/jdk8/.dockerignore create mode 100644 epicmorg/prod/jdk8/Dockerfile create mode 100644 epicmorg/prod/jdk8/Makefile delete mode 100644 epicmorg/prod/locale.gen delete mode 100644 epicmorg/prod/locale.gen.full create mode 100644 epicmorg/prod/main/.docker-repository.yml create mode 100644 epicmorg/prod/main/.dockerignore rename epicmorg/{prod-jdk8 => prod/main}/Dockerfile (61%) rename epicmorg/{prod-jdk8 => prod/main}/Makefile (100%) rename epicmorg/{prod-jdk8 => prod/main}/deb-multimedia-keyring.gpg (100%) rename epicmorg/{prod-jdk8 => prod/main}/locale.gen (100%) rename epicmorg/{prod-jdk8 => prod/main}/locale.gen.full (100%) rename epicmorg/{prod-jdk8 => prod/main}/sources.list (100%) delete mode 100644 epicmorg/prod/sources.list diff --git a/.travis.yml b/.travis.yml index fe859382a..a8296e214 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,18 +46,48 @@ matrix: #### Our High priority images ######################################### +# - name: Template +# script: +# - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin +# - docker build --compress -t user/repo:tag path/to/folder/contains/dockerfile +# - docker push user/repo:tag + - name: Base Production script: - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - - docker build --compress -t epicmorg/prod:latest epicmorg/prod + - docker build --compress -t epicmorg/prod:latest epicmorg/prod/main - docker push epicmorg/prod:latest + - name: Base Production + JDK 8 + script: + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - docker build --compress -t epicmorg/prod:jdk8 epicmorg/prod/jdk8 + - docker push epicmorg/prod:jdk8 + + - name: Base Production + JDK 11 + script: + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - docker build --compress -t epicmorg/prod:jdk11 epicmorg/prod/jdk11 + - docker push epicmorg/prod:jdk11 + - name: Base Develop script: - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - docker build --compress -t epicmorg/devel:latest epicmorg/devel - docker push epicmorg/devel:latest + - name: Base Develop + JDK 8 + script: + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - docker build --compress -t epicmorg/devel:jdk8 epicmorg/devel/jdk8 + - docker push epicmorg/devel:jdk8 + + - name: Base Develop + JDK 11 + script: + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - docker build --compress -t epicmorg/devel:jdk11 epicmorg/devel/jdk11 + - docker push epicmorg/devel:jdk11 + - name: TeamCity Agent script: - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin diff --git a/epicmorg/devel/.docker-repository.yml b/epicmorg/devel/jdk11/.docker-repository.yml similarity index 100% rename from epicmorg/devel/.docker-repository.yml rename to epicmorg/devel/jdk11/.docker-repository.yml diff --git a/epicmorg/devel/.dockerignore b/epicmorg/devel/jdk11/.dockerignore similarity index 100% rename from epicmorg/devel/.dockerignore rename to epicmorg/devel/jdk11/.dockerignore diff --git a/epicmorg/devel/jdk11/Dockerfile b/epicmorg/devel/jdk11/Dockerfile new file mode 100644 index 000000000..e97bdf420 --- /dev/null +++ b/epicmorg/devel/jdk11/Dockerfile @@ -0,0 +1,23 @@ +FROM epicmorg/devel +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# installing java11 +################################################################## +RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add - && \ + echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \ + apt-get update && \ + apt-get install -y --allow-unauthenticated adoptopenjdk-11-hotspot && \ + mkdir /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre && \ + ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/bin && \ + ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/lib + + +################################################################## +# cleaninig up +################################################################## +RUN apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb diff --git a/epicmorg/devel/jdk11/Makefile b/epicmorg/devel/jdk11/Makefile new file mode 100644 index 000000000..62e0280e0 --- /dev/null +++ b/epicmorg/devel/jdk11/Makefile @@ -0,0 +1,5 @@ +all: emgdev +emgdev: + docker build --compress -t epicmorg/devel:jdk11 . + docker push epicmorg/devel:jdk11 + diff --git a/epicmorg/devel/jdk8/.docker-repository.yml b/epicmorg/devel/jdk8/.docker-repository.yml new file mode 100644 index 000000000..9ab554e4d --- /dev/null +++ b/epicmorg/devel/jdk8/.docker-repository.yml @@ -0,0 +1 @@ +repository: epicmorg/devel diff --git a/epicmorg/prod-jdk8/.dockerignore b/epicmorg/devel/jdk8/.dockerignore similarity index 100% rename from epicmorg/prod-jdk8/.dockerignore rename to epicmorg/devel/jdk8/.dockerignore diff --git a/epicmorg/devel/jdk8/Dockerfile b/epicmorg/devel/jdk8/Dockerfile new file mode 100644 index 000000000..a9cf2ba58 --- /dev/null +++ b/epicmorg/devel/jdk8/Dockerfile @@ -0,0 +1,20 @@ +FROM epicmorg/devel +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# installing java8 +################################################################## +RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add - && \ + echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \ + apt-get update && \ + apt-get install -y --allow-unauthenticated adoptopenjdk-8-hotspot + + +################################################################## +# cleaninig up +################################################################## +RUN apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb diff --git a/epicmorg/devel/jdk8/Makefile b/epicmorg/devel/jdk8/Makefile new file mode 100644 index 000000000..17f27ca0e --- /dev/null +++ b/epicmorg/devel/jdk8/Makefile @@ -0,0 +1,5 @@ +all: emgdev +emgdev: + docker build --compress -t epicmorg/devel:jdk8 . + docker push epicmorg/devel:jdk8 + diff --git a/epicmorg/devel/main/.docker-repository.yml b/epicmorg/devel/main/.docker-repository.yml new file mode 100644 index 000000000..9ab554e4d --- /dev/null +++ b/epicmorg/devel/main/.docker-repository.yml @@ -0,0 +1 @@ +repository: epicmorg/devel diff --git a/epicmorg/prod/.dockerignore b/epicmorg/devel/main/.dockerignore similarity index 100% rename from epicmorg/prod/.dockerignore rename to epicmorg/devel/main/.dockerignore diff --git a/epicmorg/devel/Dockerfile b/epicmorg/devel/main/Dockerfile similarity index 100% rename from epicmorg/devel/Dockerfile rename to epicmorg/devel/main/Dockerfile diff --git a/epicmorg/devel/Makefile b/epicmorg/devel/main/Makefile similarity index 100% rename from epicmorg/devel/Makefile rename to epicmorg/devel/main/Makefile diff --git a/epicmorg/devel/sources.list b/epicmorg/devel/main/sources.list similarity index 100% rename from epicmorg/devel/sources.list rename to epicmorg/devel/main/sources.list diff --git a/epicmorg/prod/Dockerfile b/epicmorg/prod/Dockerfile deleted file mode 100644 index a9c4bef17..000000000 --- a/epicmorg/prod/Dockerfile +++ /dev/null @@ -1,85 +0,0 @@ -FROM debian:buster -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# buster sources list -################################################################## -COPY deb-multimedia-keyring.gpg /etc/apt/trusted.gpg.d/deb-multimedia-keyring.gpg -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/sources.list -RUN apt update && apt dist-upgrade -y -COPY locale.gen /etc/locale.gen - -################################################################## -# installing utils -################################################################## -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ - apt-get update && \ - apt-get install -y --allow-unauthenticated \ - apt-transport-https \ - apt-utils \ - bash \ - ca-certificates \ - cmatrix \ - cmatrix-xfont \ - console-cyrillic \ - curl \ - ffmpeg \ - fontconfig \ - git \ - gnupg \ - gnupg2 \ - graphicsmagick \ - htop \ - iftop \ - iputils-ping \ - kmod \ - libzip4 \ - locales \ - lsb-release \ - lsof \ - lynx \ - mc \ - nano \ - nmap \ - openssl \ - perl \ - procps \ - rsync \ - screenfetch \ - smbclient \ - sudo \ - telnet \ - tini \ - tmux \ - tree \ - ttf-dejavu \ - util-linux \ - uuid-runtime \ - wget \ - zip - -################################################################## -# installing java8 -################################################################## -#RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 && \ -# echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list && \ -# apt-get update && \ -# apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - -RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add - && \ - echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \ - apt-get update && \ - apt-get install -y --allow-unauthenticated adoptopenjdk-11-hotspot && \ - mkdir /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre && \ - ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/bin && \ - ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/lib - -################################################################## -# cleaninig up -################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb diff --git a/epicmorg/prod/Makefile b/epicmorg/prod/Makefile deleted file mode 100644 index 9c6cb3e47..000000000 --- a/epicmorg/prod/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -all: emgprod -emgprod: - docker build --compress -t epicmorg/prod . - docker push epicmorg/prod - diff --git a/epicmorg/prod/deb-multimedia-keyring.gpg b/epicmorg/prod/deb-multimedia-keyring.gpg deleted file mode 100644 index a4f2b1006e8a1c556adb8801ed5ac01fc4124d96..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7607 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 /etc/apt/sources.list.d/adoptopenjdk-official.list && \ + apt-get update && \ + apt-get install -y --allow-unauthenticated adoptopenjdk-11-hotspot && \ + mkdir /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre && \ + ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/bin && \ + ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/lib + +################################################################## +# cleaninig up +################################################################## +RUN apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb diff --git a/epicmorg/prod/jdk11/Makefile b/epicmorg/prod/jdk11/Makefile new file mode 100644 index 000000000..0e1191be5 --- /dev/null +++ b/epicmorg/prod/jdk11/Makefile @@ -0,0 +1,5 @@ +all: emgprod +emgprod: + docker build --compress -t epicmorg/prod:jdk11 . + docker push epicmorg/prod:jdk11 + diff --git a/epicmorg/prod/.docker-repository.yml b/epicmorg/prod/jdk8/.docker-repository.yml similarity index 100% rename from epicmorg/prod/.docker-repository.yml rename to epicmorg/prod/jdk8/.docker-repository.yml diff --git a/epicmorg/prod/jdk8/.dockerignore b/epicmorg/prod/jdk8/.dockerignore new file mode 100644 index 000000000..99176b278 --- /dev/null +++ b/epicmorg/prod/jdk8/.dockerignore @@ -0,0 +1,3 @@ +.git +scripts +.idea \ No newline at end of file diff --git a/epicmorg/prod/jdk8/Dockerfile b/epicmorg/prod/jdk8/Dockerfile new file mode 100644 index 000000000..4d5d8c7b4 --- /dev/null +++ b/epicmorg/prod/jdk8/Dockerfile @@ -0,0 +1,19 @@ +FROM epicmorg/prod +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# installing java8 +################################################################## +RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add - && \ + echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \ + apt-get update && \ + apt-get install -y --allow-unauthenticated adoptopenjdk-8-hotspot + +################################################################## +# cleaninig up +################################################################## +RUN apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb diff --git a/epicmorg/prod/jdk8/Makefile b/epicmorg/prod/jdk8/Makefile new file mode 100644 index 000000000..7ee8c155f --- /dev/null +++ b/epicmorg/prod/jdk8/Makefile @@ -0,0 +1,5 @@ +all: emgprod +emgprod: + docker build --compress -t epicmorg/prod:jdk8 . + docker push epicmorg/prod:jdk8 + diff --git a/epicmorg/prod/locale.gen b/epicmorg/prod/locale.gen deleted file mode 100644 index 02f100afa..000000000 --- a/epicmorg/prod/locale.gen +++ /dev/null @@ -1,12 +0,0 @@ -en_GB.UTF-8 UTF-8 -en_GB ISO-8859-1 -en_GB.ISO-8859-15 ISO-8859-15 -en_US.UTF-8 UTF-8 -en_US ISO-8859-1 -en_US.ISO-8859-15 ISO-8859-15 -ru_RU.UTF-8 UTF-8 -ru_RU.KOI8-R KOI8-R -ru_RU ISO-8859-5 -ru_RU.CP1251 CP1251 -ru_UA.UTF-8 UTF-8 -ru_UA KOI8-U diff --git a/epicmorg/prod/locale.gen.full b/epicmorg/prod/locale.gen.full deleted file mode 100644 index 602141659..000000000 --- a/epicmorg/prod/locale.gen.full +++ /dev/null @@ -1,496 +0,0 @@ -aa_DJ.UTF-8 UTF-8 -aa_DJ ISO-8859-1 -aa_ER UTF-8 -aa_ER@saaho UTF-8 -aa_ET UTF-8 -af_ZA.UTF-8 UTF-8 -af_ZA ISO-8859-1 -agr_PE UTF-8 -ak_GH UTF-8 -am_ET UTF-8 -an_ES.UTF-8 UTF-8 -an_ES ISO-8859-15 -anp_IN UTF-8 -ar_AE.UTF-8 UTF-8 -ar_AE ISO-8859-6 -ar_BH.UTF-8 UTF-8 -ar_BH ISO-8859-6 -ar_DZ.UTF-8 UTF-8 -ar_DZ ISO-8859-6 -ar_EG.UTF-8 UTF-8 -ar_EG ISO-8859-6 -ar_IN UTF-8 -ar_IQ.UTF-8 UTF-8 -ar_IQ ISO-8859-6 -ar_JO.UTF-8 UTF-8 -ar_JO ISO-8859-6 -ar_KW.UTF-8 UTF-8 -ar_KW ISO-8859-6 -ar_LB.UTF-8 UTF-8 -ar_LB ISO-8859-6 -ar_LY.UTF-8 UTF-8 -ar_LY ISO-8859-6 -ar_MA.UTF-8 UTF-8 -ar_MA ISO-8859-6 -ar_OM.UTF-8 UTF-8 -ar_OM ISO-8859-6 -ar_QA.UTF-8 UTF-8 -ar_QA ISO-8859-6 -ar_SA.UTF-8 UTF-8 -ar_SA ISO-8859-6 -ar_SD.UTF-8 UTF-8 -ar_SD ISO-8859-6 -ar_SS UTF-8 -ar_SY.UTF-8 UTF-8 -ar_SY ISO-8859-6 -ar_TN.UTF-8 UTF-8 -ar_TN ISO-8859-6 -ar_YE.UTF-8 UTF-8 -ar_YE ISO-8859-6 -ayc_PE UTF-8 -az_AZ UTF-8 -az_IR UTF-8 -as_IN UTF-8 -ast_ES.UTF-8 UTF-8 -ast_ES ISO-8859-15 -be_BY.UTF-8 UTF-8 -be_BY CP1251 -be_BY@latin UTF-8 -bem_ZM UTF-8 -ber_DZ UTF-8 -ber_MA UTF-8 -bg_BG.UTF-8 UTF-8 -bg_BG CP1251 -bhb_IN.UTF-8 UTF-8 -bho_IN UTF-8 -bho_NP UTF-8 -bi_VU UTF-8 -bn_BD UTF-8 -bn_IN UTF-8 -bo_CN UTF-8 -bo_IN UTF-8 -br_FR.UTF-8 UTF-8 -br_FR ISO-8859-1 -br_FR@euro ISO-8859-15 -brx_IN UTF-8 -bs_BA.UTF-8 UTF-8 -bs_BA ISO-8859-2 -byn_ER UTF-8 -ca_AD.UTF-8 UTF-8 -ca_AD ISO-8859-15 -ca_ES.UTF-8 UTF-8 -ca_ES ISO-8859-1 -ca_ES@euro ISO-8859-15 -ca_ES@valencia UTF-8 -ca_FR.UTF-8 UTF-8 -ca_FR ISO-8859-15 -ca_IT.UTF-8 UTF-8 -ca_IT ISO-8859-15 -ce_RU UTF-8 -chr_US UTF-8 -cmn_TW UTF-8 -crh_UA UTF-8 -cs_CZ.UTF-8 UTF-8 -cs_CZ ISO-8859-2 -csb_PL UTF-8 -cv_RU UTF-8 -cy_GB.UTF-8 UTF-8 -cy_GB ISO-8859-14 -da_DK.UTF-8 UTF-8 -da_DK ISO-8859-1 -de_AT.UTF-8 UTF-8 -de_AT ISO-8859-1 -de_AT@euro ISO-8859-15 -de_BE.UTF-8 UTF-8 -de_BE ISO-8859-1 -de_BE@euro ISO-8859-15 -de_CH.UTF-8 UTF-8 -de_CH ISO-8859-1 -de_DE.UTF-8 UTF-8 -de_DE ISO-8859-1 -de_DE@euro ISO-8859-15 -de_IT.UTF-8 UTF-8 -de_IT ISO-8859-1 -de_LI.UTF-8 UTF-8 -de_LU.UTF-8 UTF-8 -de_LU ISO-8859-1 -de_LU@euro ISO-8859-15 -doi_IN UTF-8 -dsb_DE UTF-8 -dv_MV UTF-8 -dz_BT UTF-8 -el_GR.UTF-8 UTF-8 -el_GR ISO-8859-7 -el_GR@euro ISO-8859-7 -el_CY.UTF-8 UTF-8 -el_CY ISO-8859-7 -en_AG UTF-8 -en_AU.UTF-8 UTF-8 -en_AU ISO-8859-1 -en_BW.UTF-8 UTF-8 -en_BW ISO-8859-1 -en_CA.UTF-8 UTF-8 -en_CA ISO-8859-1 -en_DK.UTF-8 UTF-8 -en_DK.ISO-8859-15 ISO-8859-15 -en_DK ISO-8859-1 -en_GB.UTF-8 UTF-8 -en_GB ISO-8859-1 -en_GB.ISO-8859-15 ISO-8859-15 -en_HK.UTF-8 UTF-8 -en_HK ISO-8859-1 -en_IE.UTF-8 UTF-8 -en_IE ISO-8859-1 -en_IE@euro ISO-8859-15 -en_IL UTF-8 -en_IN UTF-8 -en_NG UTF-8 -en_NZ.UTF-8 UTF-8 -en_NZ ISO-8859-1 -en_PH.UTF-8 UTF-8 -en_PH ISO-8859-1 -en_SC.UTF-8 UTF-8 -en_SG.UTF-8 UTF-8 -en_SG ISO-8859-1 -en_US.UTF-8 UTF-8 -en_US ISO-8859-1 -en_US.ISO-8859-15 ISO-8859-15 -en_ZA.UTF-8 UTF-8 -en_ZA ISO-8859-1 -en_ZM UTF-8 -en_ZW.UTF-8 UTF-8 -en_ZW ISO-8859-1 -eo UTF-8 -es_AR.UTF-8 UTF-8 -es_AR ISO-8859-1 -es_BO.UTF-8 UTF-8 -es_BO ISO-8859-1 -es_CL.UTF-8 UTF-8 -es_CL ISO-8859-1 -es_CO.UTF-8 UTF-8 -es_CO ISO-8859-1 -es_CR.UTF-8 UTF-8 -es_CR ISO-8859-1 -es_CU UTF-8 -es_DO.UTF-8 UTF-8 -es_DO ISO-8859-1 -es_EC.UTF-8 UTF-8 -es_EC ISO-8859-1 -es_ES.UTF-8 UTF-8 -es_ES ISO-8859-1 -es_ES@euro ISO-8859-15 -es_GT.UTF-8 UTF-8 -es_GT ISO-8859-1 -es_HN.UTF-8 UTF-8 -es_HN ISO-8859-1 -es_MX.UTF-8 UTF-8 -es_MX ISO-8859-1 -es_NI.UTF-8 UTF-8 -es_NI ISO-8859-1 -es_PA.UTF-8 UTF-8 -es_PA ISO-8859-1 -es_PE.UTF-8 UTF-8 -es_PE ISO-8859-1 -es_PR.UTF-8 UTF-8 -es_PR ISO-8859-1 -es_PY.UTF-8 UTF-8 -es_PY ISO-8859-1 -es_SV.UTF-8 UTF-8 -es_SV ISO-8859-1 -es_US.UTF-8 UTF-8 -es_US ISO-8859-1 -es_UY.UTF-8 UTF-8 -es_UY ISO-8859-1 -es_VE.UTF-8 UTF-8 -es_VE ISO-8859-1 -et_EE.UTF-8 UTF-8 -et_EE ISO-8859-1 -et_EE.ISO-8859-15 ISO-8859-15 -eu_ES.UTF-8 UTF-8 -eu_ES ISO-8859-1 -eu_ES@euro ISO-8859-15 -eu_FR.UTF-8 UTF-8 -eu_FR ISO-8859-1 -eu_FR@euro ISO-8859-15 -fa_IR UTF-8 -ff_SN UTF-8 -fi_FI.UTF-8 UTF-8 -fi_FI ISO-8859-1 -fi_FI@euro ISO-8859-15 -fil_PH UTF-8 -fo_FO.UTF-8 UTF-8 -fo_FO ISO-8859-1 -fr_BE.UTF-8 UTF-8 -fr_BE ISO-8859-1 -fr_BE@euro ISO-8859-15 -fr_CA.UTF-8 UTF-8 -fr_CA ISO-8859-1 -fr_CH.UTF-8 UTF-8 -fr_CH ISO-8859-1 -fr_FR.UTF-8 UTF-8 -fr_FR ISO-8859-1 -fr_FR@euro ISO-8859-15 -fr_LU.UTF-8 UTF-8 -fr_LU ISO-8859-1 -fr_LU@euro ISO-8859-15 -fur_IT UTF-8 -fy_NL UTF-8 -fy_DE UTF-8 -ga_IE.UTF-8 UTF-8 -ga_IE ISO-8859-1 -ga_IE@euro ISO-8859-15 -gd_GB.UTF-8 UTF-8 -gd_GB ISO-8859-15 -gez_ER UTF-8 -gez_ER@abegede UTF-8 -gez_ET UTF-8 -gez_ET@abegede UTF-8 -gl_ES.UTF-8 UTF-8 -gl_ES ISO-8859-1 -gl_ES@euro ISO-8859-15 -gu_IN UTF-8 -gv_GB.UTF-8 UTF-8 -gv_GB ISO-8859-1 -ha_NG UTF-8 -hak_TW UTF-8 -he_IL.UTF-8 UTF-8 -he_IL ISO-8859-8 -hi_IN UTF-8 -hif_FJ UTF-8 -hne_IN UTF-8 -hr_HR.UTF-8 UTF-8 -hr_HR ISO-8859-2 -hsb_DE.UTF-8 UTF-8 -hsb_DE ISO-8859-2 -ht_HT UTF-8 -hu_HU.UTF-8 UTF-8 -hu_HU ISO-8859-2 -hy_AM UTF-8 -hy_AM.ARMSCII-8 ARMSCII-8 -ia_FR UTF-8 -id_ID.UTF-8 UTF-8 -id_ID ISO-8859-1 -ig_NG UTF-8 -ik_CA UTF-8 -is_IS.UTF-8 UTF-8 -is_IS ISO-8859-1 -it_CH.UTF-8 UTF-8 -it_CH ISO-8859-1 -it_IT.UTF-8 UTF-8 -it_IT ISO-8859-1 -it_IT@euro ISO-8859-15 -iu_CA UTF-8 -ja_JP.UTF-8 UTF-8 -ja_JP.EUC-JP EUC-JP -ka_GE.UTF-8 UTF-8 -ka_GE GEORGIAN-PS -kab_DZ UTF-8 -kk_KZ.UTF-8 UTF-8 -kk_KZ PT154 -kk_KZ.RK1048 RK1048 -kl_GL.UTF-8 UTF-8 -kl_GL ISO-8859-1 -km_KH UTF-8 -kn_IN UTF-8 -ko_KR.UTF-8 UTF-8 -ko_KR.EUC-KR EUC-KR -kok_IN UTF-8 -ks_IN UTF-8 -ks_IN@devanagari UTF-8 -ku_TR.UTF-8 UTF-8 -ku_TR ISO-8859-9 -kw_GB.UTF-8 UTF-8 -kw_GB ISO-8859-1 -ky_KG UTF-8 -lb_LU UTF-8 -lg_UG.UTF-8 UTF-8 -lg_UG ISO-8859-10 -li_BE UTF-8 -li_NL UTF-8 -lij_IT UTF-8 -ln_CD UTF-8 -lo_LA UTF-8 -lt_LT.UTF-8 UTF-8 -lt_LT ISO-8859-13 -lv_LV.UTF-8 UTF-8 -lv_LV ISO-8859-13 -lzh_TW UTF-8 -mag_IN UTF-8 -mai_IN UTF-8 -mai_NP UTF-8 -mfe_MU UTF-8 -mg_MG.UTF-8 UTF-8 -mg_MG ISO-8859-15 -mhr_RU UTF-8 -mi_NZ.UTF-8 UTF-8 -mi_NZ ISO-8859-13 -miq_NI UTF-8 -mjw_IN UTF-8 -mk_MK.UTF-8 UTF-8 -mk_MK ISO-8859-5 -ml_IN UTF-8 -mn_MN UTF-8 -mni_IN UTF-8 -mr_IN UTF-8 -ms_MY.UTF-8 UTF-8 -ms_MY ISO-8859-1 -mt_MT.UTF-8 UTF-8 -mt_MT ISO-8859-3 -my_MM UTF-8 -nan_TW UTF-8 -nan_TW@latin UTF-8 -nb_NO.UTF-8 UTF-8 -nb_NO ISO-8859-1 -nds_DE UTF-8 -nds_NL UTF-8 -ne_NP UTF-8 -nhn_MX UTF-8 -niu_NU UTF-8 -niu_NZ UTF-8 -nl_AW UTF-8 -nl_BE.UTF-8 UTF-8 -nl_BE ISO-8859-1 -nl_BE@euro ISO-8859-15 -nl_NL.UTF-8 UTF-8 -nl_NL ISO-8859-1 -nl_NL@euro ISO-8859-15 -nn_NO.UTF-8 UTF-8 -nn_NO ISO-8859-1 -nr_ZA UTF-8 -nso_ZA UTF-8 -oc_FR.UTF-8 UTF-8 -oc_FR ISO-8859-1 -om_ET UTF-8 -om_KE.UTF-8 UTF-8 -om_KE ISO-8859-1 -or_IN UTF-8 -os_RU UTF-8 -pa_IN UTF-8 -pa_PK UTF-8 -pap_AW UTF-8 -pap_CW UTF-8 -pl_PL.UTF-8 UTF-8 -pl_PL ISO-8859-2 -ps_AF UTF-8 -pt_BR.UTF-8 UTF-8 -pt_BR ISO-8859-1 -pt_PT.UTF-8 UTF-8 -pt_PT ISO-8859-1 -pt_PT@euro ISO-8859-15 -quz_PE UTF-8 -raj_IN UTF-8 -ro_RO.UTF-8 UTF-8 -ro_RO ISO-8859-2 -ru_RU.UTF-8 UTF-8 -ru_RU.KOI8-R KOI8-R -ru_RU ISO-8859-5 -ru_RU.CP1251 CP1251 -ru_UA.UTF-8 UTF-8 -ru_UA KOI8-U -rw_RW UTF-8 -sa_IN UTF-8 -sah_RU UTF-8 -sat_IN UTF-8 -sc_IT UTF-8 -sd_IN UTF-8 -sd_IN@devanagari UTF-8 -se_NO UTF-8 -sgs_LT UTF-8 -shn_MM UTF-8 -shs_CA UTF-8 -si_LK UTF-8 -sid_ET UTF-8 -sk_SK.UTF-8 UTF-8 -sk_SK ISO-8859-2 -sl_SI.UTF-8 UTF-8 -sl_SI ISO-8859-2 -sm_WS UTF-8 -so_DJ.UTF-8 UTF-8 -so_DJ ISO-8859-1 -so_ET UTF-8 -so_KE.UTF-8 UTF-8 -so_KE ISO-8859-1 -so_SO.UTF-8 UTF-8 -so_SO ISO-8859-1 -sq_AL.UTF-8 UTF-8 -sq_AL ISO-8859-1 -sq_MK UTF-8 -sr_ME UTF-8 -sr_RS UTF-8 -sr_RS@latin UTF-8 -ss_ZA UTF-8 -st_ZA.UTF-8 UTF-8 -st_ZA ISO-8859-1 -sv_FI.UTF-8 UTF-8 -sv_FI ISO-8859-1 -sv_FI@euro ISO-8859-15 -sv_SE.UTF-8 UTF-8 -sv_SE ISO-8859-1 -sv_SE.ISO-8859-15 ISO-8859-15 -sw_KE UTF-8 -sw_TZ UTF-8 -szl_PL UTF-8 -ta_IN UTF-8 -ta_LK UTF-8 -tcy_IN.UTF-8 UTF-8 -te_IN UTF-8 -tg_TJ.UTF-8 UTF-8 -tg_TJ KOI8-T -th_TH.UTF-8 UTF-8 -th_TH TIS-620 -the_NP UTF-8 -ti_ER UTF-8 -ti_ET UTF-8 -tig_ER UTF-8 -tk_TM UTF-8 -tl_PH.UTF-8 UTF-8 -tl_PH ISO-8859-1 -tn_ZA UTF-8 -to_TO UTF-8 -tpi_PG UTF-8 -tr_CY.UTF-8 UTF-8 -tr_CY ISO-8859-9 -tr_TR.UTF-8 UTF-8 -tr_TR ISO-8859-9 -ts_ZA UTF-8 -tt_RU UTF-8 -tt_RU@iqtelif UTF-8 -ug_CN UTF-8 -uk_UA.UTF-8 UTF-8 -uk_UA KOI8-U -unm_US UTF-8 -ur_IN UTF-8 -ur_PK UTF-8 -uz_UZ.UTF-8 UTF-8 -uz_UZ ISO-8859-1 -uz_UZ@cyrillic UTF-8 -ve_ZA UTF-8 -vi_VN UTF-8 -wa_BE.UTF-8 UTF-8 -wa_BE ISO-8859-1 -wa_BE@euro ISO-8859-15 -wae_CH UTF-8 -wal_ET UTF-8 -wo_SN UTF-8 -xh_ZA.UTF-8 UTF-8 -xh_ZA ISO-8859-1 -yi_US.UTF-8 UTF-8 -yi_US CP1255 -yo_NG UTF-8 -yue_HK UTF-8 -yuw_PG UTF-8 -zh_CN.UTF-8 UTF-8 -zh_CN.GB18030 GB18030 -zh_CN.GBK GBK -zh_CN GB2312 -zh_HK.UTF-8 UTF-8 -zh_HK BIG5-HKSCS -zh_SG.UTF-8 UTF-8 -zh_SG.GBK GBK -zh_SG GB2312 -zh_TW.UTF-8 UTF-8 -zh_TW.EUC-TW EUC-TW -zh_TW BIG5 -zu_ZA.UTF-8 UTF-8 -zu_ZA ISO-8859-1 - diff --git a/epicmorg/prod/main/.docker-repository.yml b/epicmorg/prod/main/.docker-repository.yml new file mode 100644 index 000000000..1e50bcd0a --- /dev/null +++ b/epicmorg/prod/main/.docker-repository.yml @@ -0,0 +1 @@ +repository: epicmorg/prod diff --git a/epicmorg/prod/main/.dockerignore b/epicmorg/prod/main/.dockerignore new file mode 100644 index 000000000..99176b278 --- /dev/null +++ b/epicmorg/prod/main/.dockerignore @@ -0,0 +1,3 @@ +.git +scripts +.idea \ No newline at end of file diff --git a/epicmorg/prod-jdk8/Dockerfile b/epicmorg/prod/main/Dockerfile similarity index 61% rename from epicmorg/prod-jdk8/Dockerfile rename to epicmorg/prod/main/Dockerfile index a9c4bef17..e472cfb5e 100644 --- a/epicmorg/prod-jdk8/Dockerfile +++ b/epicmorg/prod/main/Dockerfile @@ -60,22 +60,6 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio wget \ zip -################################################################## -# installing java8 -################################################################## -#RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 && \ -# echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list && \ -# apt-get update && \ -# apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - -RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add - && \ - echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \ - apt-get update && \ - apt-get install -y --allow-unauthenticated adoptopenjdk-11-hotspot && \ - mkdir /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre && \ - ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/bin && \ - ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/lib - ################################################################## # cleaninig up ################################################################## diff --git a/epicmorg/prod-jdk8/Makefile b/epicmorg/prod/main/Makefile similarity index 100% rename from epicmorg/prod-jdk8/Makefile rename to epicmorg/prod/main/Makefile diff --git a/epicmorg/prod-jdk8/deb-multimedia-keyring.gpg b/epicmorg/prod/main/deb-multimedia-keyring.gpg similarity index 100% rename from epicmorg/prod-jdk8/deb-multimedia-keyring.gpg rename to epicmorg/prod/main/deb-multimedia-keyring.gpg diff --git a/epicmorg/prod-jdk8/locale.gen b/epicmorg/prod/main/locale.gen similarity index 100% rename from epicmorg/prod-jdk8/locale.gen rename to epicmorg/prod/main/locale.gen diff --git a/epicmorg/prod-jdk8/locale.gen.full b/epicmorg/prod/main/locale.gen.full similarity index 100% rename from epicmorg/prod-jdk8/locale.gen.full rename to epicmorg/prod/main/locale.gen.full diff --git a/epicmorg/prod-jdk8/sources.list b/epicmorg/prod/main/sources.list similarity index 100% rename from epicmorg/prod-jdk8/sources.list rename to epicmorg/prod/main/sources.list diff --git a/epicmorg/prod/sources.list b/epicmorg/prod/sources.list deleted file mode 100644 index e8180240e..000000000 --- a/epicmorg/prod/sources.list +++ /dev/null @@ -1,17 +0,0 @@ -#main -deb http://ftp.ru.debian.org/debian/ buster main contrib non-free -deb-src http://ftp.ru.debian.org/debian/ buster main contrib non-free -deb http://ftp.ru.debian.org/debian/ buster-updates main contrib non-free -deb-src http://ftp.ru.debian.org/debian/ buster-updates main contrib non-free -deb http://ftp.ru.debian.org/debian/ buster-proposed-updates main contrib non-free -deb-src http://ftp.ru.debian.org/debian/ buster-proposed-updates main contrib non-free - -#security -deb http://ftp.ru.debian.org/debian-security/ buster/updates main contrib non-free -deb-src http://ftp.ru.debian.org/debian-security/ buster/updates main contrib non-free - -##multimedia -#deb http://ftp.ru.debian.org/debian-multimedia/ buster main non-free -#deb-src http://ftp.ru.debian.org/debian-multimedia/ buster main non-free -#deb http://ftp.ru.debian.org/debian-multimedia/ buster-backports main -#deb-src http://ftp.ru.debian.org/debian-multimedia/ buster-backports main diff --git a/teamcity-agent/Dockerfile b/teamcity-agent/Dockerfile index cc20494f6..ac578d7fb 100644 --- a/teamcity-agent/Dockerfile +++ b/teamcity-agent/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/devel +FROM epicmorg/devel:jdk11 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive From 259591579aafe916afcb178a0eedf765abd24661 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 13 Jan 2020 19:12:40 +0300 Subject: [PATCH 3/9] status deleted --- .travis.yml | 11 +++++----- staytus/.docker-repository.yml | 1 - staytus/.dockerignore | 3 --- staytus/Dockerfile | 30 -------------------------- staytus/Makefile | 4 ---- staytus/README.md | 37 -------------------------------- staytus/entrypoint.sh | 39 ---------------------------------- 7 files changed, 6 insertions(+), 119 deletions(-) delete mode 100644 staytus/.docker-repository.yml delete mode 100644 staytus/.dockerignore delete mode 100644 staytus/Dockerfile delete mode 100644 staytus/Makefile delete mode 100644 staytus/README.md delete mode 100755 staytus/entrypoint.sh diff --git a/.travis.yml b/.travis.yml index a8296e214..c6f7a3a2a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -748,11 +748,12 @@ matrix: # - docker build --compress -t epicmorg/repo:tag path/to/folder # - docker push epicmorg/repo:tag - - name: Staytus - script: - - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - - docker build --compress -t epicmorg/staytus:latest staytus - - docker push epicmorg/staytus:latest +#### Deprecated +# - name: Staytus +# script: +# - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin +# - docker build --compress -t epicmorg/staytus:latest staytus +# - docker push epicmorg/staytus:latest - name: qBitTorrent - latest script: diff --git a/staytus/.docker-repository.yml b/staytus/.docker-repository.yml deleted file mode 100644 index c455bd083..000000000 --- a/staytus/.docker-repository.yml +++ /dev/null @@ -1 +0,0 @@ -repository: epicmorg/staytus diff --git a/staytus/.dockerignore b/staytus/.dockerignore deleted file mode 100644 index f5523d40c..000000000 --- a/staytus/.dockerignore +++ /dev/null @@ -1,3 +0,0 @@ -.git -scripts -.idea diff --git a/staytus/Dockerfile b/staytus/Dockerfile deleted file mode 100644 index 6cfdc523c..000000000 --- a/staytus/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -FROM ruby:buster -LABEL maintainer="Tim Perry ; EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -USER root - -COPY --from=epicmorg/prod /etc/locale.gen /etc/locale.gen -COPY --from=epicmorg/prod /etc/apt/sources.list /etc/apt/sources.list -COPY --from=epicmorg/prod /etc/apt/trusted.gpg.d/deb-multimedia-keyring.gpg /etc/apt/trusted.gpg.d/deb-multimedia-keyring.gpg -COPY entrypoint.sh /entrypoint.sh - -RUN apt update && \ - apt dist-upgrade -y && \ - # node as the JS engine for uglifier - apt-get install -y nodejs git && \ - gem install bundler && \ - rm -rfv /var/lib/apt/lists/* /tmp/* /var/tmp/* - -RUN cd /opt && \ - git clone https://github.com/adamcooke/staytus.git staytus && \ - cd /opt/staytus && \ - bundle install --deployment --without development:test - -# Persists copies of other relevant files (DB config, custom themes). Contents of this are copied -# to the relevant places each time the container is started -VOLUME /opt/staytus/persisted - -EXPOSE 5000 - -ENTRYPOINT /entrypoint.sh \ No newline at end of file diff --git a/staytus/Makefile b/staytus/Makefile deleted file mode 100644 index cb4650ff7..000000000 --- a/staytus/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -all: st - -st: - docker build --compress -t epicmorg/staytus:latest . diff --git a/staytus/README.md b/staytus/README.md deleted file mode 100644 index 4f64ed297..000000000 --- a/staytus/README.md +++ /dev/null @@ -1,37 +0,0 @@ -## Info -This is a custom improved image from this [original repository](https://github.com/adamcooke/staytus). - -## How to -* Install databese and setup user -* Install container and connect to database -* dont forget about static files! `/opt/staytus/public/assets` - -## Compose example - -```yml -version: '3.7' -services: - mysql: - container_name: mysql - image: mysql:5.7 - restart: always - staytus: - container_name: staytus - image: epicmorg/staytus - restart: always - ports: - - "5000:5000" - volumes: - - staytus-persisted:/opt/staytus/persisted - environment: - - DB_USER=root - - DB_PASSWORD=password - - DB_HOST=mysql #(dns or ip) - depends_on: - - mysql - tmpfs: - - /tmp -volumes: - staytus-persisted: - external: true -``` diff --git a/staytus/entrypoint.sh b/staytus/entrypoint.sh deleted file mode 100755 index 9325bdbdb..000000000 --- a/staytus/entrypoint.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -: ${DB_USER:=root} -: ${DB_PASSWORD:=root} -: ${DB_DATABSE:=staytus} -: ${DB_HOST:=127.0.0.1} -#: ${DB_PORT:=3306} - -cd /opt/staytus - -# Configure DB with random password, if not already configured -if [ ! -f /opt/staytus/persisted/config/database.yml ]; then - export DB_PASSWORD=${DB_PASSWORD} - - mysqladmin -u root -ptemp-password password ${DB_PASSWORD} - echo "CREATE DATABASE staytus CHARSET utf8 COLLATE utf8_unicode_ci" | mysql -u root -p${DB_PASSWORD} - - cp config/database.example.yml config/database.yml - sed -i "s/username:.*/username: ${DB_USER}/" config/database.yml - sed -i "s|password:.*|password: ${DB_PASSWORD}|" config/database.yml - sed -i "s|host:.*|host: ${DB_HOST}|" config/database.yml - sed -i "s|database:.*|database: ${DB_DATABSE}|" config/database.yml - - # Copy the config to persist it, and later copy back on each start, to persist this config file - # without persisting all of /config (which is mostly app code) - mkdir /opt/staytus/persisted/config - cp config/database.yml /opt/staytus/persisted/config/database.yml - - bundle exec rake staytus:build staytus:install -else - # Use the previously saved config from the persisted volume - cp /opt/staytus/persisted/config/database.yml config/database.yml - # TODO also copy themes back and forth too - - # If already configured, check if there are any migrations to run - bundle exec rake staytus:build staytus:upgrade -fi - -bundle exec foreman start \ No newline at end of file From ea68bb1f91b6e4b97a419978bc242b5ff8d86ae9 Mon Sep 17 00:00:00 2001 From: STAM Date: Tue, 14 Jan 2020 12:39:27 +0300 Subject: [PATCH 4/9] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 2063b9358..4746318cd 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # [![Travis (.org)](https://img.shields.io/travis/EpicMorg/docker-scripts?style=flat-square)](https://travis-ci.org/EpicMorg/docker-scripts) [![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)](LICENSE.md) [![Changelog](https://img.shields.io/badge/Changelog-yellow.svg?style=popout-square)](CHANGELOG.md) +[![](https://codescene.io/projects/6535/status.svg) Get more details at **codescene.io**.](https://codescene.io/projects/6535/jobs/latest-successful/results) + # Some popular products | Application | Pulls | Notes From 71390f9b5e48ea4fbc9fc06921c06553ca1e29da Mon Sep 17 00:00:00 2001 From: STAM Date: Tue, 14 Jan 2020 12:41:01 +0300 Subject: [PATCH 5/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4746318cd..d23021bff 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # [![Travis (.org)](https://img.shields.io/travis/EpicMorg/docker-scripts?style=flat-square)](https://travis-ci.org/EpicMorg/docker-scripts) [![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)](LICENSE.md) [![Changelog](https://img.shields.io/badge/Changelog-yellow.svg?style=popout-square)](CHANGELOG.md) -[![](https://codescene.io/projects/6535/status.svg) Get more details at **codescene.io**.](https://codescene.io/projects/6535/jobs/latest-successful/results) +[![](https://codescene.io/projects/6535/status.svg)](https://codescene.io/projects/6535/jobs/latest-successful/results) # Some popular products From 5a70aee79d37d8b937621322badac1de7e95146d Mon Sep 17 00:00:00 2001 From: STAM Date: Tue, 14 Jan 2020 12:45:08 +0300 Subject: [PATCH 6/9] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d23021bff..f8def2ef7 100644 --- a/README.md +++ b/README.md @@ -6,10 +6,10 @@ | Application | Pulls | Notes | ------ | ------ | ------ -| [![Atlassian Bitbucket](https://img.shields.io/badge/Atlassian-Bitbucket-brightgreen.svg?style=popout-square)](https://www.atlassian.com/software/bitbucket/download) | [![](https://img.shields.io/docker/pulls/epicmorg/bitbucket.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/bitbucket/) | Just generic `Atlassian Bitbucket` server. From [![Atlassian Bitbucket](https://img.shields.io/badge/6.2.0-ff69b4.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/tree/master/atlassian/bitbucket/6.2.0) version. You can install `datacenter`. -| [![Atlassian Confluence](https://img.shields.io/badge/Atlassian-Confluence-brightgreen.svg?style=popout-square)](https://www.atlassian.com/software/confluence/download) | [![](https://img.shields.io/docker/pulls/epicmorg/confluence.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/confluence/) | Just generic `Atlassian Confluence` server. From [![Atlassian Confluence](https://img.shields.io/badge/6.9.0-ff69b4.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/tree/master/atlassian/confluence/6.9.0) version. You can install `datacenter`. -| [![Atlassian Jira](https://img.shields.io/badge/Atlassian-Jira-brightgreen.svg?style=popout-square)](https://www.atlassian.com/software/bitbucket/download) | [![](https://img.shields.io/docker/pulls/epicmorg/jira.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/jira/) | Just generic `Atlassian Jira: Softrware` server. From [![Atlassian Jira](https://img.shields.io/badge/7.10.0-ff69b4.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/tree/master/atlassian/jira/7.10.0) version. You can install `servicedesk\core\datacenter`. -| [![Nginx Mainline](https://img.shields.io/badge/Nginx%20Mainline-brightgreen.svg?style=popout-square)](https://deb.sury.org/) | [![](https://img.shields.io/docker/pulls/epicmorg/balancer.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/balancer/) | Nginx mainline custom build by [EpicMorg Team](https://github.com/EpicMorg) with http2 support and some modules. +| [![Atlassian Bitbucket](https://img.shields.io/badge/Atlassian-Bitbucket-brightgreen.svg?style=popout-square)](https://www.atlassian.com/software/bitbucket/download) | [![](https://img.shields.io/docker/pulls/epicmorg/bitbucket.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/bitbucket/) | Just generic `Atlassian Bitbucket` server. You also can install `datacenter` edition. +| [![Atlassian Confluence](https://img.shields.io/badge/Atlassian-Confluence-brightgreen.svg?style=popout-square)](https://www.atlassian.com/software/confluence/download) | [![](https://img.shields.io/docker/pulls/epicmorg/confluence.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/confluence/) | Just generic `Atlassian Confluence` server. You also can install `datacenter` edition. +| [![Atlassian Jira](https://img.shields.io/badge/Atlassian-Jira-brightgreen.svg?style=popout-square)](https://www.atlassian.com/software/bitbucket/download) | [![](https://img.shields.io/docker/pulls/epicmorg/jira.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/jira/) | Just generic `Atlassian Jira: Softrware` server. You also can install `servicedesk`, `core` or `datacenter` editions. +| ![Nginx Mainline](https://img.shields.io/badge/Nginx%20Mainline-brightgreen.svg?style=popout-square) | [![](https://img.shields.io/docker/pulls/epicmorg/balancer.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/balancer/) | Nginx mainline custom build by [EpicMorg Team](https://github.com/EpicMorg) with http2 support and some modules. | [![Apache2](https://img.shields.io/badge/Apache2-brightgreen.svg?style=popout-square)](https://deb.sury.org/) | [![](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/) | [![](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. | [![nc](https://img.shields.io/badge/nextcloud-brightgreen.svg?style=popout-square)](https://hub.docker.com/_/nextcloud) | [![](https://img.shields.io/docker/pulls/epicmorg/nextcloud.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/nextcloud/ ) | Just fixed `nextcloud:latest` release. From fb8ce01f9192a70cffba4a04ee4d2d03b80cddee Mon Sep 17 00:00:00 2001 From: root Date: Tue, 14 Jan 2020 13:35:12 +0300 Subject: [PATCH 7/9] depretaced archive --- _deprecated/staytus/.docker-repository.yml | 1 + _deprecated/staytus/.dockerignore | 3 ++ _deprecated/staytus/Dockerfile | 30 +++++++++++++++++ _deprecated/staytus/Makefile | 4 +++ _deprecated/staytus/README.md | 37 ++++++++++++++++++++ _deprecated/staytus/entrypoint.sh | 39 ++++++++++++++++++++++ 6 files changed, 114 insertions(+) create mode 100644 _deprecated/staytus/.docker-repository.yml create mode 100644 _deprecated/staytus/.dockerignore create mode 100644 _deprecated/staytus/Dockerfile create mode 100644 _deprecated/staytus/Makefile create mode 100644 _deprecated/staytus/README.md create mode 100755 _deprecated/staytus/entrypoint.sh diff --git a/_deprecated/staytus/.docker-repository.yml b/_deprecated/staytus/.docker-repository.yml new file mode 100644 index 000000000..c455bd083 --- /dev/null +++ b/_deprecated/staytus/.docker-repository.yml @@ -0,0 +1 @@ +repository: epicmorg/staytus diff --git a/_deprecated/staytus/.dockerignore b/_deprecated/staytus/.dockerignore new file mode 100644 index 000000000..f5523d40c --- /dev/null +++ b/_deprecated/staytus/.dockerignore @@ -0,0 +1,3 @@ +.git +scripts +.idea diff --git a/_deprecated/staytus/Dockerfile b/_deprecated/staytus/Dockerfile new file mode 100644 index 000000000..6cfdc523c --- /dev/null +++ b/_deprecated/staytus/Dockerfile @@ -0,0 +1,30 @@ +FROM ruby:buster +LABEL maintainer="Tim Perry ; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +USER root + +COPY --from=epicmorg/prod /etc/locale.gen /etc/locale.gen +COPY --from=epicmorg/prod /etc/apt/sources.list /etc/apt/sources.list +COPY --from=epicmorg/prod /etc/apt/trusted.gpg.d/deb-multimedia-keyring.gpg /etc/apt/trusted.gpg.d/deb-multimedia-keyring.gpg +COPY entrypoint.sh /entrypoint.sh + +RUN apt update && \ + apt dist-upgrade -y && \ + # node as the JS engine for uglifier + apt-get install -y nodejs git && \ + gem install bundler && \ + rm -rfv /var/lib/apt/lists/* /tmp/* /var/tmp/* + +RUN cd /opt && \ + git clone https://github.com/adamcooke/staytus.git staytus && \ + cd /opt/staytus && \ + bundle install --deployment --without development:test + +# Persists copies of other relevant files (DB config, custom themes). Contents of this are copied +# to the relevant places each time the container is started +VOLUME /opt/staytus/persisted + +EXPOSE 5000 + +ENTRYPOINT /entrypoint.sh \ No newline at end of file diff --git a/_deprecated/staytus/Makefile b/_deprecated/staytus/Makefile new file mode 100644 index 000000000..cb4650ff7 --- /dev/null +++ b/_deprecated/staytus/Makefile @@ -0,0 +1,4 @@ +all: st + +st: + docker build --compress -t epicmorg/staytus:latest . diff --git a/_deprecated/staytus/README.md b/_deprecated/staytus/README.md new file mode 100644 index 000000000..4f64ed297 --- /dev/null +++ b/_deprecated/staytus/README.md @@ -0,0 +1,37 @@ +## Info +This is a custom improved image from this [original repository](https://github.com/adamcooke/staytus). + +## How to +* Install databese and setup user +* Install container and connect to database +* dont forget about static files! `/opt/staytus/public/assets` + +## Compose example + +```yml +version: '3.7' +services: + mysql: + container_name: mysql + image: mysql:5.7 + restart: always + staytus: + container_name: staytus + image: epicmorg/staytus + restart: always + ports: + - "5000:5000" + volumes: + - staytus-persisted:/opt/staytus/persisted + environment: + - DB_USER=root + - DB_PASSWORD=password + - DB_HOST=mysql #(dns or ip) + depends_on: + - mysql + tmpfs: + - /tmp +volumes: + staytus-persisted: + external: true +``` diff --git a/_deprecated/staytus/entrypoint.sh b/_deprecated/staytus/entrypoint.sh new file mode 100755 index 000000000..9325bdbdb --- /dev/null +++ b/_deprecated/staytus/entrypoint.sh @@ -0,0 +1,39 @@ +#!/bin/bash + +: ${DB_USER:=root} +: ${DB_PASSWORD:=root} +: ${DB_DATABSE:=staytus} +: ${DB_HOST:=127.0.0.1} +#: ${DB_PORT:=3306} + +cd /opt/staytus + +# Configure DB with random password, if not already configured +if [ ! -f /opt/staytus/persisted/config/database.yml ]; then + export DB_PASSWORD=${DB_PASSWORD} + + mysqladmin -u root -ptemp-password password ${DB_PASSWORD} + echo "CREATE DATABASE staytus CHARSET utf8 COLLATE utf8_unicode_ci" | mysql -u root -p${DB_PASSWORD} + + cp config/database.example.yml config/database.yml + sed -i "s/username:.*/username: ${DB_USER}/" config/database.yml + sed -i "s|password:.*|password: ${DB_PASSWORD}|" config/database.yml + sed -i "s|host:.*|host: ${DB_HOST}|" config/database.yml + sed -i "s|database:.*|database: ${DB_DATABSE}|" config/database.yml + + # Copy the config to persist it, and later copy back on each start, to persist this config file + # without persisting all of /config (which is mostly app code) + mkdir /opt/staytus/persisted/config + cp config/database.yml /opt/staytus/persisted/config/database.yml + + bundle exec rake staytus:build staytus:install +else + # Use the previously saved config from the persisted volume + cp /opt/staytus/persisted/config/database.yml config/database.yml + # TODO also copy themes back and forth too + + # If already configured, check if there are any migrations to run + bundle exec rake staytus:build staytus:upgrade +fi + +bundle exec foreman start \ No newline at end of file From 86d9d8c18161b855c77030cada0912736d7cff09 Mon Sep 17 00:00:00 2001 From: stam Date: Tue, 14 Jan 2020 13:51:36 +0300 Subject: [PATCH 8/9] 01/13/2020 --- .travis.yml | 6 + CHANGELOG.md | 7 + atlassian/bitbucket/6.2.0/Dockerfile | 2 +- atlassian/bitbucket/6.2.1/Dockerfile | 2 +- atlassian/bitbucket/6.3.0/Dockerfile | 2 +- atlassian/bitbucket/6.3.1/Dockerfile | 2 +- atlassian/bitbucket/6.3.2/Dockerfile | 2 +- atlassian/bitbucket/6.4.0/Dockerfile | 2 +- atlassian/bitbucket/6.4.1/Dockerfile | 2 +- atlassian/bitbucket/6.5.0/Dockerfile | 2 +- atlassian/bitbucket/6.5.1/Dockerfile | 2 +- atlassian/bitbucket/6.5.2/Dockerfile | 2 +- atlassian/bitbucket/6.6.0/Dockerfile | 2 +- atlassian/bitbucket/6.6.1/Dockerfile | 2 +- atlassian/bitbucket/6.6.2/Dockerfile | 2 +- atlassian/bitbucket/6.7.0/Dockerfile | 2 +- atlassian/bitbucket/6.7.1/Dockerfile | 2 +- atlassian/bitbucket/6.7.2/Dockerfile | 2 +- atlassian/bitbucket/6.8.0/Dockerfile | 2 +- atlassian/bitbucket/6.8.1/Dockerfile | 2 +- atlassian/bitbucket/latest/Dockerfile | 2 +- atlassian/confluence/6.10.0/Dockerfile | 2 +- atlassian/confluence/6.10.1/Dockerfile | 2 +- atlassian/confluence/6.10.2/Dockerfile | 2 +- atlassian/confluence/6.11.0/Dockerfile | 2 +- atlassian/confluence/6.11.1/Dockerfile | 2 +- atlassian/confluence/6.11.2/Dockerfile | 2 +- atlassian/confluence/6.12.0/Dockerfile | 2 +- atlassian/confluence/6.12.1/Dockerfile | 2 +- atlassian/confluence/6.12.2/Dockerfile | 2 +- atlassian/confluence/6.12.3/Dockerfile | 2 +- atlassian/confluence/6.12.4/Dockerfile | 2 +- atlassian/confluence/6.13.0/Dockerfile | 2 +- atlassian/confluence/6.13.1/Dockerfile | 2 +- atlassian/confluence/6.13.2/Dockerfile | 2 +- atlassian/confluence/6.13.3/Dockerfile | 2 +- atlassian/confluence/6.13.4/Dockerfile | 2 +- atlassian/confluence/6.14.0/Dockerfile | 2 +- atlassian/confluence/6.14.1/Dockerfile | 2 +- atlassian/confluence/6.14.2/Dockerfile | 2 +- atlassian/confluence/6.14.3/Dockerfile | 2 +- atlassian/confluence/6.15.1/Dockerfile | 2 +- atlassian/confluence/6.15.2/Dockerfile | 2 +- atlassian/confluence/6.15.4/Dockerfile | 2 +- atlassian/confluence/6.15.6/Dockerfile | 2 +- atlassian/confluence/6.15.7/Dockerfile | 2 +- atlassian/confluence/6.15.8/Dockerfile | 2 +- atlassian/confluence/6.15.9/Dockerfile | 2 +- atlassian/confluence/6.9.0/Dockerfile | 2 +- atlassian/confluence/6.9.1/Dockerfile | 2 +- atlassian/confluence/6.9.3/Dockerfile | 2 +- atlassian/confluence/7.0.1/Dockerfile | 2 +- atlassian/confluence/7.0.2/Dockerfile | 2 +- atlassian/confluence/7.0.3/Dockerfile | 2 +- atlassian/confluence/7.0.4/Dockerfile | 2 +- atlassian/confluence/7.1.0/Dockerfile | 2 +- atlassian/confluence/7.1.1/Dockerfile | 2 +- atlassian/confluence/7.1.2/Dockerfile | 2 +- atlassian/confluence/7.2.0/Dockerfile | 2 +- atlassian/confluence/latest/Dockerfile | 2 +- atlassian/jira/7.10.0/Dockerfile | 2 +- atlassian/jira/7.10.1/Dockerfile | 2 +- atlassian/jira/7.10.2/Dockerfile | 2 +- atlassian/jira/7.11.0/Dockerfile | 2 +- atlassian/jira/7.11.1/Dockerfile | 2 +- atlassian/jira/7.11.2/Dockerfile | 2 +- atlassian/jira/7.12.0/Dockerfile | 2 +- atlassian/jira/7.12.1/Dockerfile | 2 +- atlassian/jira/7.12.3/Dockerfile | 2 +- atlassian/jira/7.13.0/Dockerfile | 2 +- atlassian/jira/7.13.1/Dockerfile | 2 +- atlassian/jira/7.13.11/Dockerfile | 2 +- atlassian/jira/7.13.2/Dockerfile | 2 +- atlassian/jira/7.13.3/Dockerfile | 2 +- atlassian/jira/7.13.4/Dockerfile | 2 +- atlassian/jira/7.13.5/Dockerfile | 2 +- atlassian/jira/7.13.6/Dockerfile | 2 +- atlassian/jira/7.13.8/Dockerfile | 2 +- atlassian/jira/7.13.9/Dockerfile | 2 +- atlassian/jira/8.0.0/Dockerfile | 2 +- atlassian/jira/8.0.2/Dockerfile | 2 +- atlassian/jira/8.1.0/Dockerfile | 2 +- atlassian/jira/8.1.1/Dockerfile | 2 +- atlassian/jira/8.2.0/Dockerfile | 2 +- atlassian/jira/8.2.1/Dockerfile | 2 +- atlassian/jira/8.2.2/Dockerfile | 2 +- atlassian/jira/8.2.3/Dockerfile | 2 +- atlassian/jira/8.2.4/Dockerfile | 2 +- atlassian/jira/8.3.0/Dockerfile | 2 +- atlassian/jira/8.3.1/Dockerfile | 2 +- atlassian/jira/8.3.2/Dockerfile | 2 +- atlassian/jira/8.3.3/Dockerfile | 2 +- atlassian/jira/8.3.4/Dockerfile | 2 +- atlassian/jira/8.4.0/Dockerfile | 2 +- atlassian/jira/8.4.1/Dockerfile | 2 +- atlassian/jira/8.4.2/Dockerfile | 2 +- atlassian/jira/8.5.0/Dockerfile | 2 +- atlassian/jira/8.5.1/Dockerfile | 2 +- atlassian/jira/8.5.2/Dockerfile | 2 +- atlassian/jira/8.5.3/.docker-repository.yml | 1 + atlassian/jira/8.5.3/.dockerignore | 3 + atlassian/jira/8.5.3/Dockerfile | 47 ++++++ atlassian/jira/8.5.3/Makefile | 4 + atlassian/jira/8.5.3/README.md | 151 ++++++++++++++++++++ atlassian/jira/8.5.3/entrypoint.sh | 89 ++++++++++++ atlassian/jira/README.md | 3 +- atlassian/jira/latest/Dockerfile | 2 +- 107 files changed, 408 insertions(+), 99 deletions(-) create mode 100644 atlassian/jira/8.5.3/.docker-repository.yml create mode 100644 atlassian/jira/8.5.3/.dockerignore create mode 100644 atlassian/jira/8.5.3/Dockerfile create mode 100644 atlassian/jira/8.5.3/Makefile create mode 100644 atlassian/jira/8.5.3/README.md create mode 100644 atlassian/jira/8.5.3/entrypoint.sh diff --git a/.travis.yml b/.travis.yml index c6f7a3a2a..f6b920434 100644 --- a/.travis.yml +++ b/.travis.yml @@ -739,6 +739,12 @@ matrix: - docker build --compress -t epicmorg/jira:8.5.2 atlassian/jira/8.5.2 - docker push epicmorg/jira:8.5.2 + - name: Jira 8.5.3 + script: + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - docker build --compress -t epicmorg/jira:8.5.3 atlassian/jira/8.5.3 + - docker push epicmorg/jira:8.5.3 + ######################################### #### Our minor priority images ######################################### diff --git a/CHANGELOG.md b/CHANGELOG.md index 607ce3ccb..aa395df6b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,11 @@ ## Changelog +* 01/13/2020 + * separated `base` images to `prod`, `prod:jdk8`, `prod:jdk11`, `devel`, `devel:jdk8`, `devel:jdk11` + * teamcity - `devel:jdk11` + * updated current atlassian contaners: + * `bitbucket` all current versions (`6.2`-`latest`) - `prod:jdk11`, + * `confluence` before `7.1` - `prod:jdk8`, after - `7.1` - `prod:jdk11`, + * `jira` before `8.2` - `prod:jdk8`, after - `8.2` - `prod:jdk11` * 12/13/2019 * updated `teamcity agent`. added `php 7.3` support. * fixed `nginx` image. diff --git a/atlassian/bitbucket/6.2.0/Dockerfile b/atlassian/bitbucket/6.2.0/Dockerfile index 2385b1817..b54e88165 100644 --- a/atlassian/bitbucket/6.2.0/Dockerfile +++ b/atlassian/bitbucket/6.2.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.2.1/Dockerfile b/atlassian/bitbucket/6.2.1/Dockerfile index 3dfeebc81..e75ca5e43 100644 --- a/atlassian/bitbucket/6.2.1/Dockerfile +++ b/atlassian/bitbucket/6.2.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.3.0/Dockerfile b/atlassian/bitbucket/6.3.0/Dockerfile index 9cf5555d3..8f9acef31 100644 --- a/atlassian/bitbucket/6.3.0/Dockerfile +++ b/atlassian/bitbucket/6.3.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.3.1/Dockerfile b/atlassian/bitbucket/6.3.1/Dockerfile index 0f8a5e6a0..346601dd1 100644 --- a/atlassian/bitbucket/6.3.1/Dockerfile +++ b/atlassian/bitbucket/6.3.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.3.2/Dockerfile b/atlassian/bitbucket/6.3.2/Dockerfile index 7e5d8b860..7b26a0df2 100644 --- a/atlassian/bitbucket/6.3.2/Dockerfile +++ b/atlassian/bitbucket/6.3.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.4.0/Dockerfile b/atlassian/bitbucket/6.4.0/Dockerfile index 485bb4df3..1e0821e46 100644 --- a/atlassian/bitbucket/6.4.0/Dockerfile +++ b/atlassian/bitbucket/6.4.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.4.1/Dockerfile b/atlassian/bitbucket/6.4.1/Dockerfile index a5f00aa66..6b25e0704 100644 --- a/atlassian/bitbucket/6.4.1/Dockerfile +++ b/atlassian/bitbucket/6.4.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.5.0/Dockerfile b/atlassian/bitbucket/6.5.0/Dockerfile index a08d739f6..75c4d0dc3 100644 --- a/atlassian/bitbucket/6.5.0/Dockerfile +++ b/atlassian/bitbucket/6.5.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.5.1/Dockerfile b/atlassian/bitbucket/6.5.1/Dockerfile index 431ecac8f..93a21cf28 100644 --- a/atlassian/bitbucket/6.5.1/Dockerfile +++ b/atlassian/bitbucket/6.5.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.5.2/Dockerfile b/atlassian/bitbucket/6.5.2/Dockerfile index b6de3f791..3b08acf93 100644 --- a/atlassian/bitbucket/6.5.2/Dockerfile +++ b/atlassian/bitbucket/6.5.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.6.0/Dockerfile b/atlassian/bitbucket/6.6.0/Dockerfile index 0a67b6735..599124d29 100644 --- a/atlassian/bitbucket/6.6.0/Dockerfile +++ b/atlassian/bitbucket/6.6.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.6.1/Dockerfile b/atlassian/bitbucket/6.6.1/Dockerfile index 875adfb1a..c459bc9a4 100644 --- a/atlassian/bitbucket/6.6.1/Dockerfile +++ b/atlassian/bitbucket/6.6.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.6.2/Dockerfile b/atlassian/bitbucket/6.6.2/Dockerfile index 5a5afe54e..e0db4fc35 100644 --- a/atlassian/bitbucket/6.6.2/Dockerfile +++ b/atlassian/bitbucket/6.6.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.7.0/Dockerfile b/atlassian/bitbucket/6.7.0/Dockerfile index 839f08193..7e422c1eb 100644 --- a/atlassian/bitbucket/6.7.0/Dockerfile +++ b/atlassian/bitbucket/6.7.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.7.1/Dockerfile b/atlassian/bitbucket/6.7.1/Dockerfile index a8ac5dce3..cd2d58f0b 100644 --- a/atlassian/bitbucket/6.7.1/Dockerfile +++ b/atlassian/bitbucket/6.7.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.7.2/Dockerfile b/atlassian/bitbucket/6.7.2/Dockerfile index bc757a64d..eb4e08c46 100644 --- a/atlassian/bitbucket/6.7.2/Dockerfile +++ b/atlassian/bitbucket/6.7.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.8.0/Dockerfile b/atlassian/bitbucket/6.8.0/Dockerfile index a0ea7cffd..2106400bf 100644 --- a/atlassian/bitbucket/6.8.0/Dockerfile +++ b/atlassian/bitbucket/6.8.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.8.1/Dockerfile b/atlassian/bitbucket/6.8.1/Dockerfile index ab68fe188..239ce3eaa 100644 --- a/atlassian/bitbucket/6.8.1/Dockerfile +++ b/atlassian/bitbucket/6.8.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/latest/Dockerfile b/atlassian/bitbucket/latest/Dockerfile index ab68fe188..239ce3eaa 100644 --- a/atlassian/bitbucket/latest/Dockerfile +++ b/atlassian/bitbucket/latest/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.10.0/Dockerfile b/atlassian/confluence/6.10.0/Dockerfile index f1afe7678..4ad1fde3c 100644 --- a/atlassian/confluence/6.10.0/Dockerfile +++ b/atlassian/confluence/6.10.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.10.1/Dockerfile b/atlassian/confluence/6.10.1/Dockerfile index bbb6fc614..03804167e 100644 --- a/atlassian/confluence/6.10.1/Dockerfile +++ b/atlassian/confluence/6.10.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.10.2/Dockerfile b/atlassian/confluence/6.10.2/Dockerfile index 862582038..b7a0eabd0 100644 --- a/atlassian/confluence/6.10.2/Dockerfile +++ b/atlassian/confluence/6.10.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.11.0/Dockerfile b/atlassian/confluence/6.11.0/Dockerfile index efd2d7f92..a398499dc 100644 --- a/atlassian/confluence/6.11.0/Dockerfile +++ b/atlassian/confluence/6.11.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.11.1/Dockerfile b/atlassian/confluence/6.11.1/Dockerfile index 4e3a61d01..b9f04c9fa 100644 --- a/atlassian/confluence/6.11.1/Dockerfile +++ b/atlassian/confluence/6.11.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.11.2/Dockerfile b/atlassian/confluence/6.11.2/Dockerfile index a5dd1630f..68b11e92e 100644 --- a/atlassian/confluence/6.11.2/Dockerfile +++ b/atlassian/confluence/6.11.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.12.0/Dockerfile b/atlassian/confluence/6.12.0/Dockerfile index 515716af1..1dc6fad00 100644 --- a/atlassian/confluence/6.12.0/Dockerfile +++ b/atlassian/confluence/6.12.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.12.1/Dockerfile b/atlassian/confluence/6.12.1/Dockerfile index 91f5ca282..4bbf92616 100644 --- a/atlassian/confluence/6.12.1/Dockerfile +++ b/atlassian/confluence/6.12.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.12.2/Dockerfile b/atlassian/confluence/6.12.2/Dockerfile index a6f0f0c74..5371f2910 100644 --- a/atlassian/confluence/6.12.2/Dockerfile +++ b/atlassian/confluence/6.12.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.12.3/Dockerfile b/atlassian/confluence/6.12.3/Dockerfile index 3b234f8ea..754b5b423 100644 --- a/atlassian/confluence/6.12.3/Dockerfile +++ b/atlassian/confluence/6.12.3/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.12.4/Dockerfile b/atlassian/confluence/6.12.4/Dockerfile index 441d82a50..e19663666 100644 --- a/atlassian/confluence/6.12.4/Dockerfile +++ b/atlassian/confluence/6.12.4/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.13.0/Dockerfile b/atlassian/confluence/6.13.0/Dockerfile index b1a41e1d1..ccb8e85b9 100644 --- a/atlassian/confluence/6.13.0/Dockerfile +++ b/atlassian/confluence/6.13.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.13.1/Dockerfile b/atlassian/confluence/6.13.1/Dockerfile index bd4df3634..d443befb1 100644 --- a/atlassian/confluence/6.13.1/Dockerfile +++ b/atlassian/confluence/6.13.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.13.2/Dockerfile b/atlassian/confluence/6.13.2/Dockerfile index 491fc3627..d70d32f7e 100644 --- a/atlassian/confluence/6.13.2/Dockerfile +++ b/atlassian/confluence/6.13.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.13.3/Dockerfile b/atlassian/confluence/6.13.3/Dockerfile index cbd126655..9b3339a01 100644 --- a/atlassian/confluence/6.13.3/Dockerfile +++ b/atlassian/confluence/6.13.3/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.13.4/Dockerfile b/atlassian/confluence/6.13.4/Dockerfile index af9c8b332..754b6e94f 100644 --- a/atlassian/confluence/6.13.4/Dockerfile +++ b/atlassian/confluence/6.13.4/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.14.0/Dockerfile b/atlassian/confluence/6.14.0/Dockerfile index 7c9be0bab..75528b59f 100644 --- a/atlassian/confluence/6.14.0/Dockerfile +++ b/atlassian/confluence/6.14.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.14.1/Dockerfile b/atlassian/confluence/6.14.1/Dockerfile index e5de2f9fc..1afce19ac 100644 --- a/atlassian/confluence/6.14.1/Dockerfile +++ b/atlassian/confluence/6.14.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.14.2/Dockerfile b/atlassian/confluence/6.14.2/Dockerfile index 196c67177..9c09f9aa0 100644 --- a/atlassian/confluence/6.14.2/Dockerfile +++ b/atlassian/confluence/6.14.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.14.3/Dockerfile b/atlassian/confluence/6.14.3/Dockerfile index 9a6b58967..09045771f 100644 --- a/atlassian/confluence/6.14.3/Dockerfile +++ b/atlassian/confluence/6.14.3/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.15.1/Dockerfile b/atlassian/confluence/6.15.1/Dockerfile index 2fa5c0ff3..b4760d22a 100644 --- a/atlassian/confluence/6.15.1/Dockerfile +++ b/atlassian/confluence/6.15.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.15.2/Dockerfile b/atlassian/confluence/6.15.2/Dockerfile index 4c9d5f4f3..8f3f731e4 100644 --- a/atlassian/confluence/6.15.2/Dockerfile +++ b/atlassian/confluence/6.15.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.15.4/Dockerfile b/atlassian/confluence/6.15.4/Dockerfile index 8448b9c83..bd22b9524 100644 --- a/atlassian/confluence/6.15.4/Dockerfile +++ b/atlassian/confluence/6.15.4/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.15.6/Dockerfile b/atlassian/confluence/6.15.6/Dockerfile index c59edf6ee..7ded10ca3 100644 --- a/atlassian/confluence/6.15.6/Dockerfile +++ b/atlassian/confluence/6.15.6/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.15.7/Dockerfile b/atlassian/confluence/6.15.7/Dockerfile index 96f818204..fd475818d 100644 --- a/atlassian/confluence/6.15.7/Dockerfile +++ b/atlassian/confluence/6.15.7/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.15.8/Dockerfile b/atlassian/confluence/6.15.8/Dockerfile index 2d0e14cf5..88eb7769b 100644 --- a/atlassian/confluence/6.15.8/Dockerfile +++ b/atlassian/confluence/6.15.8/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.15.9/Dockerfile b/atlassian/confluence/6.15.9/Dockerfile index d2fa2a124..d3ce10616 100644 --- a/atlassian/confluence/6.15.9/Dockerfile +++ b/atlassian/confluence/6.15.9/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.9.0/Dockerfile b/atlassian/confluence/6.9.0/Dockerfile index d44e917af..e31383c10 100644 --- a/atlassian/confluence/6.9.0/Dockerfile +++ b/atlassian/confluence/6.9.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.9.1/Dockerfile b/atlassian/confluence/6.9.1/Dockerfile index 34d709a12..f5b01ef4a 100644 --- a/atlassian/confluence/6.9.1/Dockerfile +++ b/atlassian/confluence/6.9.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.9.3/Dockerfile b/atlassian/confluence/6.9.3/Dockerfile index 5d5f9043c..e5540d33d 100644 --- a/atlassian/confluence/6.9.3/Dockerfile +++ b/atlassian/confluence/6.9.3/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/7.0.1/Dockerfile b/atlassian/confluence/7.0.1/Dockerfile index 1ad4df6f9..b1790ded0 100644 --- a/atlassian/confluence/7.0.1/Dockerfile +++ b/atlassian/confluence/7.0.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/7.0.2/Dockerfile b/atlassian/confluence/7.0.2/Dockerfile index 58e12a520..00313c49f 100644 --- a/atlassian/confluence/7.0.2/Dockerfile +++ b/atlassian/confluence/7.0.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/7.0.3/Dockerfile b/atlassian/confluence/7.0.3/Dockerfile index 748cf587b..7968f2513 100644 --- a/atlassian/confluence/7.0.3/Dockerfile +++ b/atlassian/confluence/7.0.3/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/7.0.4/Dockerfile b/atlassian/confluence/7.0.4/Dockerfile index 321dcceba..8f6e2b2ca 100644 --- a/atlassian/confluence/7.0.4/Dockerfile +++ b/atlassian/confluence/7.0.4/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/7.1.0/Dockerfile b/atlassian/confluence/7.1.0/Dockerfile index 57114034d..66b1b2b9a 100644 --- a/atlassian/confluence/7.1.0/Dockerfile +++ b/atlassian/confluence/7.1.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/7.1.1/Dockerfile b/atlassian/confluence/7.1.1/Dockerfile index b3d10ee44..3cc9ae29e 100644 --- a/atlassian/confluence/7.1.1/Dockerfile +++ b/atlassian/confluence/7.1.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/7.1.2/Dockerfile b/atlassian/confluence/7.1.2/Dockerfile index 4c9103bec..d8dd674c6 100644 --- a/atlassian/confluence/7.1.2/Dockerfile +++ b/atlassian/confluence/7.1.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/7.2.0/Dockerfile b/atlassian/confluence/7.2.0/Dockerfile index 92ee98e39..4f7c7881c 100644 --- a/atlassian/confluence/7.2.0/Dockerfile +++ b/atlassian/confluence/7.2.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/latest/Dockerfile b/atlassian/confluence/latest/Dockerfile index 92ee98e39..4f7c7881c 100644 --- a/atlassian/confluence/latest/Dockerfile +++ b/atlassian/confluence/latest/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.10.0/Dockerfile b/atlassian/jira/7.10.0/Dockerfile index e4e2462db..a0f302de7 100644 --- a/atlassian/jira/7.10.0/Dockerfile +++ b/atlassian/jira/7.10.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.10.1/Dockerfile b/atlassian/jira/7.10.1/Dockerfile index f8c4d4fdb..6e545a8a8 100644 --- a/atlassian/jira/7.10.1/Dockerfile +++ b/atlassian/jira/7.10.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.10.2/Dockerfile b/atlassian/jira/7.10.2/Dockerfile index 6c037dd43..5a0561f1c 100644 --- a/atlassian/jira/7.10.2/Dockerfile +++ b/atlassian/jira/7.10.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.11.0/Dockerfile b/atlassian/jira/7.11.0/Dockerfile index fab5e9d1d..a2195559b 100644 --- a/atlassian/jira/7.11.0/Dockerfile +++ b/atlassian/jira/7.11.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.11.1/Dockerfile b/atlassian/jira/7.11.1/Dockerfile index ef7c5c15a..ea24c559d 100644 --- a/atlassian/jira/7.11.1/Dockerfile +++ b/atlassian/jira/7.11.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.11.2/Dockerfile b/atlassian/jira/7.11.2/Dockerfile index 13a6e815d..a4a924426 100644 --- a/atlassian/jira/7.11.2/Dockerfile +++ b/atlassian/jira/7.11.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.12.0/Dockerfile b/atlassian/jira/7.12.0/Dockerfile index 3d2d47236..2befbc48f 100644 --- a/atlassian/jira/7.12.0/Dockerfile +++ b/atlassian/jira/7.12.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.12.1/Dockerfile b/atlassian/jira/7.12.1/Dockerfile index d1af4db50..cbe320063 100644 --- a/atlassian/jira/7.12.1/Dockerfile +++ b/atlassian/jira/7.12.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.12.3/Dockerfile b/atlassian/jira/7.12.3/Dockerfile index f7e620d2a..ff5c9a997 100644 --- a/atlassian/jira/7.12.3/Dockerfile +++ b/atlassian/jira/7.12.3/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.13.0/Dockerfile b/atlassian/jira/7.13.0/Dockerfile index b4f8dae33..32d673841 100644 --- a/atlassian/jira/7.13.0/Dockerfile +++ b/atlassian/jira/7.13.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.13.1/Dockerfile b/atlassian/jira/7.13.1/Dockerfile index 639ed8f15..4f1c76cb7 100644 --- a/atlassian/jira/7.13.1/Dockerfile +++ b/atlassian/jira/7.13.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.13.11/Dockerfile b/atlassian/jira/7.13.11/Dockerfile index 6f3700465..6a1bbc847 100644 --- a/atlassian/jira/7.13.11/Dockerfile +++ b/atlassian/jira/7.13.11/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.13.2/Dockerfile b/atlassian/jira/7.13.2/Dockerfile index 1ba2cf444..61675251c 100644 --- a/atlassian/jira/7.13.2/Dockerfile +++ b/atlassian/jira/7.13.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.13.3/Dockerfile b/atlassian/jira/7.13.3/Dockerfile index e1713ba96..3bb690fbe 100644 --- a/atlassian/jira/7.13.3/Dockerfile +++ b/atlassian/jira/7.13.3/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.13.4/Dockerfile b/atlassian/jira/7.13.4/Dockerfile index c3e26ca71..7990267e9 100644 --- a/atlassian/jira/7.13.4/Dockerfile +++ b/atlassian/jira/7.13.4/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.13.5/Dockerfile b/atlassian/jira/7.13.5/Dockerfile index a5969cbb3..9dc0928e3 100644 --- a/atlassian/jira/7.13.5/Dockerfile +++ b/atlassian/jira/7.13.5/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.13.6/Dockerfile b/atlassian/jira/7.13.6/Dockerfile index 6c9a21d12..dfd1d9712 100644 --- a/atlassian/jira/7.13.6/Dockerfile +++ b/atlassian/jira/7.13.6/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.13.8/Dockerfile b/atlassian/jira/7.13.8/Dockerfile index 67615efae..e19343579 100644 --- a/atlassian/jira/7.13.8/Dockerfile +++ b/atlassian/jira/7.13.8/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.13.9/Dockerfile b/atlassian/jira/7.13.9/Dockerfile index f5ccc7ff9..3efaa8d12 100644 --- a/atlassian/jira/7.13.9/Dockerfile +++ b/atlassian/jira/7.13.9/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.0.0/Dockerfile b/atlassian/jira/8.0.0/Dockerfile index d27424007..98e94c6bc 100644 --- a/atlassian/jira/8.0.0/Dockerfile +++ b/atlassian/jira/8.0.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.0.2/Dockerfile b/atlassian/jira/8.0.2/Dockerfile index ccf2e5dc7..b4346797e 100644 --- a/atlassian/jira/8.0.2/Dockerfile +++ b/atlassian/jira/8.0.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.1.0/Dockerfile b/atlassian/jira/8.1.0/Dockerfile index 2047eff12..60a5c20be 100644 --- a/atlassian/jira/8.1.0/Dockerfile +++ b/atlassian/jira/8.1.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.1.1/Dockerfile b/atlassian/jira/8.1.1/Dockerfile index fdd46c369..3cbd9cb52 100644 --- a/atlassian/jira/8.1.1/Dockerfile +++ b/atlassian/jira/8.1.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.2.0/Dockerfile b/atlassian/jira/8.2.0/Dockerfile index b84ca55ed..6bab33843 100644 --- a/atlassian/jira/8.2.0/Dockerfile +++ b/atlassian/jira/8.2.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.2.1/Dockerfile b/atlassian/jira/8.2.1/Dockerfile index 00333e88e..f1dc5bd51 100644 --- a/atlassian/jira/8.2.1/Dockerfile +++ b/atlassian/jira/8.2.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.2.2/Dockerfile b/atlassian/jira/8.2.2/Dockerfile index 5c7592240..eb09f592e 100644 --- a/atlassian/jira/8.2.2/Dockerfile +++ b/atlassian/jira/8.2.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.2.3/Dockerfile b/atlassian/jira/8.2.3/Dockerfile index a9ab8ca00..5d85db334 100644 --- a/atlassian/jira/8.2.3/Dockerfile +++ b/atlassian/jira/8.2.3/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.2.4/Dockerfile b/atlassian/jira/8.2.4/Dockerfile index b61a60efe..fe86295f7 100644 --- a/atlassian/jira/8.2.4/Dockerfile +++ b/atlassian/jira/8.2.4/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.3.0/Dockerfile b/atlassian/jira/8.3.0/Dockerfile index 5f8fd7d2d..510cccac8 100644 --- a/atlassian/jira/8.3.0/Dockerfile +++ b/atlassian/jira/8.3.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.3.1/Dockerfile b/atlassian/jira/8.3.1/Dockerfile index 88ad71412..ba2aaf577 100644 --- a/atlassian/jira/8.3.1/Dockerfile +++ b/atlassian/jira/8.3.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.3.2/Dockerfile b/atlassian/jira/8.3.2/Dockerfile index 5d4fed2e9..23d3e6fd8 100644 --- a/atlassian/jira/8.3.2/Dockerfile +++ b/atlassian/jira/8.3.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.3.3/Dockerfile b/atlassian/jira/8.3.3/Dockerfile index 6c96077ce..2ad7f24b0 100644 --- a/atlassian/jira/8.3.3/Dockerfile +++ b/atlassian/jira/8.3.3/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.3.4/Dockerfile b/atlassian/jira/8.3.4/Dockerfile index 4025a2fc7..cb9199c1e 100644 --- a/atlassian/jira/8.3.4/Dockerfile +++ b/atlassian/jira/8.3.4/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.4.0/Dockerfile b/atlassian/jira/8.4.0/Dockerfile index ed0f03a4a..575fdcbd3 100644 --- a/atlassian/jira/8.4.0/Dockerfile +++ b/atlassian/jira/8.4.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.4.1/Dockerfile b/atlassian/jira/8.4.1/Dockerfile index 650596e00..a0be846db 100644 --- a/atlassian/jira/8.4.1/Dockerfile +++ b/atlassian/jira/8.4.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.4.2/Dockerfile b/atlassian/jira/8.4.2/Dockerfile index 24084a676..b39613392 100644 --- a/atlassian/jira/8.4.2/Dockerfile +++ b/atlassian/jira/8.4.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.5.0/Dockerfile b/atlassian/jira/8.5.0/Dockerfile index 3bf06b375..f43659f70 100644 --- a/atlassian/jira/8.5.0/Dockerfile +++ b/atlassian/jira/8.5.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.5.1/Dockerfile b/atlassian/jira/8.5.1/Dockerfile index 06753de1a..c03ba4349 100644 --- a/atlassian/jira/8.5.1/Dockerfile +++ b/atlassian/jira/8.5.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.5.2/Dockerfile b/atlassian/jira/8.5.2/Dockerfile index b0f6a23eb..b58a1df0f 100644 --- a/atlassian/jira/8.5.2/Dockerfile +++ b/atlassian/jira/8.5.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.5.3/.docker-repository.yml b/atlassian/jira/8.5.3/.docker-repository.yml new file mode 100644 index 000000000..8dc515604 --- /dev/null +++ b/atlassian/jira/8.5.3/.docker-repository.yml @@ -0,0 +1 @@ +repository: epicmorg/jira diff --git a/atlassian/jira/8.5.3/.dockerignore b/atlassian/jira/8.5.3/.dockerignore new file mode 100644 index 000000000..99176b278 --- /dev/null +++ b/atlassian/jira/8.5.3/.dockerignore @@ -0,0 +1,3 @@ +.git +scripts +.idea \ No newline at end of file diff --git a/atlassian/jira/8.5.3/Dockerfile b/atlassian/jira/8.5.3/Dockerfile new file mode 100644 index 000000000..30bc99420 --- /dev/null +++ b/atlassian/jira/8.5.3/Dockerfile @@ -0,0 +1,47 @@ +FROM epicmorg/prod:jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## +ARG JIRA_VERSION=8.5.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${JIRA_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +RUN mkdir -p ${JIRA_INSTALL_DIR} \ + && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ + && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ + && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ + && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ + && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ + && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/atlassian/jira/8.5.3/Makefile b/atlassian/jira/8.5.3/Makefile new file mode 100644 index 000000000..431d0ee96 --- /dev/null +++ b/atlassian/jira/8.5.3/Makefile @@ -0,0 +1,4 @@ +all: jr + +jr: + docker build --compress -t epicmorg/jira:8.5.3 . diff --git a/atlassian/jira/8.5.3/README.md b/atlassian/jira/8.5.3/README.md new file mode 100644 index 000000000..4cab96ead --- /dev/null +++ b/atlassian/jira/8.5.3/README.md @@ -0,0 +1,151 @@ +![Atlassian JIRA](https://www.atlassian.com/dam/wac/legacy/jira_logo_landing.png) + +JIRA Software is a software development tool used by agile teams. + +Learn more about JIRA Software: + +# Overview + +This Docker container makes it easy to get an instance of JIRA Software up and running. + +# Quick Start + +For the `JIRA_HOME` directory that is used to store application data (amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/engine/tutorials/dockervolumes/#/data-volumes), or via a named volume if using a docker version >= 1.9. + +To get started you can use a data volume, or named volumes. In this example we'll use named volumes. + + $> docker volume create --name jiraVolume + $> docker run -v jiraVolume:/var/atlassian/application-data/jira --name="jira" -d -p 8080:8080 epicmorg/jira + + +**Success**. JIRA is now available on [http://localhost:8080](http://localhost:8080)* + +Please ensure your container has the necessary resources allocated to it. We recommend 2GiB of memory allocated to accommodate the application server. See [System Requirements](https://confluence.atlassian.com/adminjiraserver071/jira-applications-installation-requirements-802592164.html) for further information. + + +_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8080` instead._ + +## Memory / Heap Size + +If you need to override JIRA's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables. + +* `JVM_MINIMUM_MEMORY` (default: 384m) + + The minimum heap size of the JVM + +* `JVM_MAXIMUM_MEMORY` (default: 768m) + + The maximum heap size of the JVM + +## Reverse Proxy Settings + +If JIRA is run behind a reverse proxy server as [described here](https://confluence.atlassian.com/adminjiraserver072/integrating-jira-with-apache-using-ssl-828788158.html), then you need to specify extra options to make JIRA aware of the setup. They can be controlled via the below environment variables. + +* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE) + + The reverse proxy's fully qualified hostname. + +* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE) + + The reverse proxy's port number via which JIRA is accessed. + +* `CATALINA_CONNECTOR_SCHEME` (default: http) + + The protocol via which JIRA is accessed. + +* `CATALINA_CONNECTOR_SECURE` (default: false) + + Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'. + +## JVM configuration + +If you need to pass additional JVM arguments to JIRA, such as specifying a custom trust store, you can add them via the below environment variable + +* `JVM_SUPPORT_RECOMMENDED_ARGS` + + Additional JVM arguments for JIRA + +Example: + + $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/jira/cacerts -v jiraVolume:/var/atlassian/application-data/jira --name="jira" -d -p 8080:8080 epicmorg/jira + +## Data Center configuration + +This docker image can be run as part of a [Data Center](https://confluence.atlassian.com/enterprise/jira-data-center-472219731.html) cluster. You can specify the following properties to start Jira as a Data Center node, instead of manually configuring a cluster.properties file, See [Installing Jira Data Center](https://confluence.atlassian.com/adminjiraserver071/installing-jira-data-center-802592197.html) for more information on each property and its possible configuration. + +* `CLUSTERED` (default: false) + + Set 'true' to enable clustering configuration to be used. This will create a **cluster.properties** file inside the container's `$JIRA_HOME` directory. + +* `JIRA_NODE_ID` (default: jira_node_) + + The unique ID for the node. By default, this will include the first eight characters of the Docker container ID, but can be overridden with a custom value. + +* `JIRA_SHARED_HOME` (default: $JIRA_HOME/shared) + + The location of the shared home directory for all Jira nodes. + +* `EHCACHE_PEER_DISCOVERY` (default: default) + + Describes how nodes find each other. + +* `EHCACHE_LISTENER_HOSTNAME` (default: NONE) + + The hostname of the current node for cache communication. Jira Data Center will resolve this this internally if the parameter isn't set. + +* `EHCACHE_LISTENER_PORT` (default: 40001) + + The port the node is going to be listening to. + +* `EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS` (default: 2000) + + The default timeout for the Ehcache listener. + +* `EHCACHE_MULTICAST_ADDRESS` (default: NONE) + + A valid multicast group address. Required when EHCACHE_PEER_DISCOVERY is set to 'automatic' insted of 'default'. + +* `EHCACHE_MULTICAST_PORT` (default: NONE) + + The dedicated port for the multicast heartbeat traffic.Required when EHCACHE_PEER_DISCOVERY is set to 'automatic' insted of 'default'. + +* `EHCACHE_MULTICAST_TIMETOLIVE` (default: NONE) + + A value between 0 and 255 which determines how far the packets will propagate. Required when EHCACHE_PEER_DISCOVERY is set to 'automatic' insted of 'default'. + +* `EHCACHE_MULTICAST_HOSTNAME` (default: NONE) + + The hostname or IP of the interface to be used for sending and receiving multicast packets. Required when EHCACHE_PEER_DISCOVERY is set to 'automatic' insted of 'default'. + +# Upgrade + +To upgrade to a more recent version of JIRA you can simply stop the `jira` container and start a new one based on a more recent image: + + $> docker stop jira + $> docker rm jira + $> docker run ... (See above) + +As your data is stored in the data volume directory on the host it will still be available after the upgrade. + +_Note: Please make sure that you **don't** accidentally remove the `jira` container and its volumes using the `-v` option._ + +# Backup + +For evaluations you can use the built-in database that will store its files in the JIRA home directory. In that case it is sufficient to create a backup archive of the docker volume. + +If you're using an external database, you can configure JIRA to make a backup automatically each night. This will back up the current state, including the database to the `jiraVolume` docker volume, which can then be archived. Alternatively you can backup the database separately, and continue to create a backup archive of the docker volume to back up the JIRA Home directory. + +Read more about data recovery and backups: [https://confluence.atlassian.com/adminjiraserver071/backing-up-data-802592964.html](https://confluence.atlassian.com/adminjiraserver071/backing-up-data-802592964.html) + +# Versioning + +The `latest` tag matches the most recent release of Atlassian JIRA Software. Thus `epicmorg/jira:latest` will use the newest version of JIRA available. + +## Versions available + +* `epicmorg/jira:latest` +* `epicmorg/jira:7.10.0` + +# Support + +This Docker container is unsupported and is intended for illustration purposes only. diff --git a/atlassian/jira/8.5.3/entrypoint.sh b/atlassian/jira/8.5.3/entrypoint.sh new file mode 100644 index 000000000..50ee4ecd1 --- /dev/null +++ b/atlassian/jira/8.5.3/entrypoint.sh @@ -0,0 +1,89 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + # Now drop privileges + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" +else + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" +fi diff --git a/atlassian/jira/README.md b/atlassian/jira/README.md index edb737cc1..c23895a07 100644 --- a/atlassian/jira/README.md +++ b/atlassian/jira/README.md @@ -4,5 +4,6 @@ All presented images avalible on our repo in docker hub. ## LTS releases: -* Latest version of Jira `7.13.3` +* Latest version of `Jira 8` branch is `8.5.3` +* Latest version of `Jira 7` branch is `7.13.3` diff --git a/atlassian/jira/latest/Dockerfile b/atlassian/jira/latest/Dockerfile index 06753de1a..c03ba4349 100644 --- a/atlassian/jira/latest/Dockerfile +++ b/atlassian/jira/latest/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive From 8693bfa78cf937f5812000767673d49919f9f108 Mon Sep 17 00:00:00 2001 From: stam Date: Tue, 14 Jan 2020 14:12:13 +0300 Subject: [PATCH 9/9] fixed devel main path in travics config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f6b920434..a67d2329d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,7 +73,7 @@ matrix: - name: Base Develop script: - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - - docker build --compress -t epicmorg/devel:latest epicmorg/devel + - docker build --compress -t epicmorg/devel:latest epicmorg/devel/main - docker push epicmorg/devel:latest - name: Base Develop + JDK 8