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 custom-releases-base-6-ubuntu (pull request #34)

Browse Source 
Create custom releases.

Approved-by: Joe Xie <jxie@atlassian.com>
This commit is contained in:
Dave Chevell 2019-07-03 04:28:34 +00:00
commit 9fe00bdf47
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -27,7 +27,7 @@ RUN chmod +x /tini
COPY entrypoint.sh /entrypoint.sh COPY entrypoint.sh /entrypoint.sh
ARG CONFLUENCE_VERSION=6.3.3 ARG CONFLUENCE_VERSION
ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/confluence/downloads/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/confluence/downloads/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \

17
bitbucket-pipelines.yml
View File

@ -2,7 +2,7 @@ image: atlassian/docker-release-maker:latest
pipelines: pipelines:
custom: custom:
create-release-base-6-adoptopenjdk8: base-6-ubuntu-create-releases:
- step: - step:
services: services:
- docker - docker
@ -13,8 +13,19 @@ pipelines:
- 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'
- docker login --username ${DOCKER_USERNAME} --password ${DOCKER_PASSWORD} - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- python /usr/src/app/run.py --create - python /usr/src/app/run.py --create
base-6-ubuntu-create-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} --build-arg CONFLUENCE_VERSION=${CONFLUENCE_VERSION} .
- docker push atlassian/confluence-server:${DOCKER_TAG}
branches: branches:
base-6-adoptopenjdk8: base-6-adoptopenjdk8:
- step: - step:
@ -27,5 +38,5 @@ pipelines:
- 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'
- docker login --username ${DOCKER_USERNAME} --password ${DOCKER_PASSWORD} - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- python /usr/src/app/run.py --update - python /usr/src/app/run.py --update