From a69f929db28b5c61e2510708c6e1587ef9e679bf Mon Sep 17 00:00:00 2001 From: Odmin Date: Sun, 14 Jul 2019 02:50:32 +0300 Subject: [PATCH] rollback to j8 --- README.md | 1 - bitbucket/6.4.0/Dockerfile | 6 +++--- bitbucket/latest/Dockerfile | 2 +- jira/8.2.3/Dockerfile | 2 +- jira/latest/Dockerfile | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 1199b4412..d04e1ea8d 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,6 @@ ## Changelog * 07/14/2019 * `jira` updated. - * `adopt openjdk v11` for `jira` and `bitbucket` containers. confluence still use v8. * 07/05/2019 * `jira` updated. * `bitbucket` updated. diff --git a/bitbucket/6.4.0/Dockerfile b/bitbucket/6.4.0/Dockerfile index 524b1b266..b80bc6206 100644 --- a/bitbucket/6.4.0/Dockerfile +++ b/bitbucket/6.4.0/Dockerfile @@ -11,7 +11,7 @@ ENV BITBUCKET_INSTALL_DIR /opt/atlassian/bitbucket ENV DEBIAN_FRONTEND noninteractive #editing sources list -RUN rm /etc/apt/sources.list +6666RUN rm /etc/apt/sources.list COPY sources.list /etc/apt/sources.list COPY locale.gen /etc/locale.gen @@ -22,8 +22,8 @@ RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certi #installing java RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 -RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-11-installer +6RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list +RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer VOLUME ["${BITBUCKET_HOME}"] WORKDIR $BITBUCKET_HOME diff --git a/bitbucket/latest/Dockerfile b/bitbucket/latest/Dockerfile index 524b1b266..fab9ff5cb 100644 --- a/bitbucket/latest/Dockerfile +++ b/bitbucket/latest/Dockerfile @@ -23,7 +23,7 @@ RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certi #installing java RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-11-installer +RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer VOLUME ["${BITBUCKET_HOME}"] WORKDIR $BITBUCKET_HOME diff --git a/jira/8.2.3/Dockerfile b/jira/8.2.3/Dockerfile index 0e9885fcd..e6f76aad4 100644 --- a/jira/8.2.3/Dockerfile +++ b/jira/8.2.3/Dockerfile @@ -23,7 +23,7 @@ RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certi #installing java RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-11-installer +RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer VOLUME ["${JIRA_HOME}"] WORKDIR $JIRA_HOME diff --git a/jira/latest/Dockerfile b/jira/latest/Dockerfile index 0e9885fcd..e6f76aad4 100644 --- a/jira/latest/Dockerfile +++ b/jira/latest/Dockerfile @@ -23,7 +23,7 @@ RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certi #installing java RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-11-installer +RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer VOLUME ["${JIRA_HOME}"] WORKDIR $JIRA_HOME