Mirrored_Repos/docker-atlassian-confluence-server
1
0
Fork 0
mirror of https://bitbucket.org/atlassian-docker/docker-atlassian-confluence-server.git synced 2024-08-30 18:22:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged in isssue/CONFSRVDEV-8918-update-confluence-docker-image-use-adopt-openjdk (pull request #25)

Browse Source 
CONFSRVDEV-8918 - Update confluence docker image to use Adopt OpenJDK

Approved-by: Joe Xie <jxie@atlassian.com>
Approved-by: Richard Atkins <richatkins@atlassian.com>
This commit is contained in:
Minh Tran 2018-11-23 02:01:04 +00:00
commit de207bbbbb
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile
View File

@ -1,4 +1,4 @@
FROM openjdk:8-jdk-alpine FROM adoptopenjdk/openjdk8:x86_64-ubuntu-jdk8u192-b12
MAINTAINER Atlassian Confluence MAINTAINER Atlassian Confluence
ENV RUN_USER daemon ENV RUN_USER daemon
@ -19,10 +19,8 @@ WORKDIR $CONFLUENCE_HOME
CMD ["/entrypoint.sh", "-fg"] CMD ["/entrypoint.sh", "-fg"]
ENTRYPOINT ["/sbin/tini", "--"] ENTRYPOINT ["/sbin/tini", "--"]
RUN apk update -qq \ RUN apt-get update && apt-get install -y wget curl bash procps perl fontconfig && apt-get clean -y && apt-get autoremove -y
&& update-ca-certificates \ RUN wget https://github.com/krallin/tini/releases/download/v0.18.0/tini -O /sbin/tini && chmod a+x /sbin/tini
&& apk add ca-certificates wget curl openssh bash procps openssl perl ttf-dejavu tini libc6-compat \
&& rm -rf /var/lib/{apt,dpkg,cache,log}/ /tmp/* /var/tmp/*
COPY entrypoint.sh /entrypoint.sh COPY entrypoint.sh /entrypoint.sh

12
bitbucket-pipelines.yml
View File

@ -4,28 +4,32 @@ clone:
pipelines: pipelines:
custom: custom:
create-release-base-6: create-release-base-6-adoptopenjdk8:
- step: - step:
script: script:
- git fetch --all - git fetch --all
- export BASE_BRANCH=base-6 - export BASE_BRANCH=base-6-adoptopenjdk8
- export BASE_VERSION=6 - export BASE_VERSION=6
- export DOCKER_REPO=atlassian/confluence-server - export DOCKER_REPO=atlassian/confluence-server
- export DOCKERFILE_VERSION_STRING=CONFLUENCE_VERSION - export DOCKERFILE_VERSION_STRING=CONFLUENCE_VERSION
- export GIT_USER=pipelinesagent - export GIT_USER=pipelinesagent
- export GIT_EMAIL=pipelines-agent@atlassian.com - export GIT_EMAIL=pipelines-agent@atlassian.com
- export MAC_PRODUCT_KEY=confluence - export MAC_PRODUCT_KEY=confluence
- export TAG_SUFFIX=ubuntu-18.04-adoptopenjdk8
- export SHOULD_CREATE_LATEST_TAG=true
- python /usr/src/app/create_release.py - python /usr/src/app/create_release.py
branches: branches:
base-6: base-6-adoptopenjdk8:
- step: - step:
script: script:
- git fetch --all - git fetch --all
- export BASE_BRANCH=base-6 - export BASE_BRANCH=base-6-adoptopenjdk8
- export BASE_VERSION=6 - export BASE_VERSION=6
- export DOCKER_REPO=atlassian/confluence-server - export DOCKER_REPO=atlassian/confluence-server
- export DOCKERFILE_VERSION_STRING=CONFLUENCE_VERSION - export DOCKERFILE_VERSION_STRING=CONFLUENCE_VERSION
- export GIT_USER=pipelinesagent - export GIT_USER=pipelinesagent
- export GIT_EMAIL=pipelines-agent@atlassian.com - export GIT_EMAIL=pipelines-agent@atlassian.com
- export MAC_PRODUCT_KEY=confluence - export MAC_PRODUCT_KEY=confluence
- export TAG_SUFFIX=ubuntu-18.04-adoptopenjdk8
- export SHOULD_CREATE_LATEST_TAG=true
- python /usr/src/app/update_release.py - python /usr/src/app/update_release.py