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 jdk11 (pull request #47)

Browse Source 
Ship JDK11 from 7.1+

Approved-by: Minh Tran <mtran@atlassian.com>
Approved-by: Steve Smith <ssmith@atlassian.com>
This commit is contained in:
Dave Chevell 2019-11-18 01:44:06 +00:00
commit 0548cc13b4
2 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@ -1,4 +1,5 @@
FROM adoptopenjdk/openjdk8:slim ARG BASE_IMAGE=adoptopenjdk:11-hotspot
FROM $BASE_IMAGE
ENV RUN_USER confluence ENV RUN_USER confluence
ENV RUN_GROUP confluence ENV RUN_GROUP confluence

60
bitbucket-pipelines.yml
View File

@ -9,7 +9,7 @@ pipelines:
- docker - docker
script: script:
- export START_VERSION='6' - export START_VERSION='6'
- export END_VERSION='8' - export END_VERSION='7'
- export DEFAULT_RELEASE='false' - export DEFAULT_RELEASE='false'
- export DOCKER_REPO='atlassian/confluence-server' - export DOCKER_REPO='atlassian/confluence-server'
- export DOCKERFILE='Dockerfile-alpine' - export DOCKERFILE='Dockerfile-alpine'
@ -20,21 +20,37 @@ pipelines:
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- python /usr/src/app/run.py --create - python /usr/src/app/run.py --create
- step: - step:
name: Confluence Ubuntu name: Confluence Ubuntu JDK 8
services: services:
- docker - docker
script: script:
- export START_VERSION='6' - export START_VERSION='6'
- export END_VERSION='8' - export END_VERSION='7.1'
- export DEFAULT_RELEASE='true' - export DEFAULT_RELEASE='true'
- export DOCKER_REPO='atlassian/confluence-server' - export DOCKER_REPO='atlassian/confluence-server'
- export DOCKERFILE_BUILDARGS='BASE_IMAGE=adoptopenjdk/openjdk8:slim'
- export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION' - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
- export MAC_PRODUCT_KEY='confluence' - export MAC_PRODUCT_KEY='confluence'
- export TAG_SUFFIXES='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8' - export TAG_SUFFIXES='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8'
- export CONCURRENT_BUILDS='3' - export CONCURRENT_BUILDS='3'
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- python /usr/src/app/run.py --create - python /usr/src/app/run.py --create
ubuntu-custom-release: - step:
name: Confluence Ubuntu JDK 11
services:
- docker
script:
- export START_VERSION='7.1'
- export END_VERSION='8'
- export DEFAULT_RELEASE='true'
- export DOCKER_REPO='atlassian/confluence-server'
- export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
- export MAC_PRODUCT_KEY='confluence'
- export TAG_SUFFIXES='jdk11,ubuntu'
- export CONCURRENT_BUILDS='3'
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- python /usr/src/app/run.py --create
custom-release:
- variables: - variables:
- name: CONFLUENCE_VERSION - name: CONFLUENCE_VERSION
- name: DOCKER_TAG - name: DOCKER_TAG
@ -47,20 +63,6 @@ pipelines:
docker build -t atlassian/confluence-server:${DOCKER_TAG} docker build -t atlassian/confluence-server:${DOCKER_TAG}
--build-arg CONFLUENCE_VERSION=${CONFLUENCE_VERSION} . --build-arg CONFLUENCE_VERSION=${CONFLUENCE_VERSION} .
- docker push atlassian/confluence-server:${DOCKER_TAG} - docker push atlassian/confluence-server:${DOCKER_TAG}
alpine-custom-release:
- variables:
- name: CONFLUENCE_VERSION
- name: DOCKER_TAG
- step:
services:
- docker
script:
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- >
docker build -t atlassian/confluence-server:${DOCKER_TAG}
-f Dockerfile-alpine
--build-arg CONFLUENCE_VERSION=${CONFLUENCE_VERSION} .
- docker push atlassian/confluence-server:${DOCKER_TAG}
branches: branches:
master: master:
- step: - step:
@ -69,7 +71,7 @@ pipelines:
- docker - docker
script: script:
- export START_VERSION='6' - export START_VERSION='6'
- export END_VERSION='8' - export END_VERSION='7'
- export DEFAULT_RELEASE='false' - export DEFAULT_RELEASE='false'
- export DOCKER_REPO='atlassian/confluence-server' - export DOCKER_REPO='atlassian/confluence-server'
- export DOCKERFILE='Dockerfile-alpine' - export DOCKERFILE='Dockerfile-alpine'
@ -80,17 +82,33 @@ pipelines:
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- python /usr/src/app/run.py --update - python /usr/src/app/run.py --update
- step: - step:
name: Confluence Ubuntu name: Confluence Ubuntu JDK 8
services: services:
- docker - docker
script: script:
- export START_VERSION='6' - export START_VERSION='6'
- export END_VERSION='7.1'
- export DEFAULT_RELEASE='true'
- export DOCKER_REPO='atlassian/confluence-server'
- export DOCKERFILE_BUILDARGS='BASE_IMAGE=adoptopenjdk/openjdk8:slim'
- export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
- export MAC_PRODUCT_KEY='confluence'
- export TAG_SUFFIXES='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8'
- export CONCURRENT_BUILDS='3'
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- python /usr/src/app/run.py --update
- step:
name: Confluence Ubuntu JDK 11
services:
- docker
script:
- export START_VERSION='7.1'
- export END_VERSION='8' - export END_VERSION='8'
- export DEFAULT_RELEASE='true' - export DEFAULT_RELEASE='true'
- export DOCKER_REPO='atlassian/confluence-server' - export DOCKER_REPO='atlassian/confluence-server'
- export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION' - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
- export MAC_PRODUCT_KEY='confluence' - export MAC_PRODUCT_KEY='confluence'
- export TAG_SUFFIXES='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8' - export TAG_SUFFIXES='jdk11,ubuntu'
- export CONCURRENT_BUILDS='3' - export CONCURRENT_BUILDS='3'
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- python /usr/src/app/run.py --update - python /usr/src/app/run.py --update