mirror of
https://bitbucket.org/atlassian-docker/docker-atlassian-confluence-server.git
synced 2024-08-30 18:22:16 +00:00
Merged in custom-releases-base-6-ubuntu (pull request #34)
Create custom releases. Approved-by: Joe Xie <jxie@atlassian.com>
This commit is contained in:
commit
9fe00bdf47
@ -27,7 +27,7 @@ RUN chmod +x /tini
|
||||
|
||||
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
|
||||
|
||||
RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
|
||||
|
@ -2,7 +2,7 @@ image: atlassian/docker-release-maker:latest
|
||||
|
||||
pipelines:
|
||||
custom:
|
||||
create-release-base-6-adoptopenjdk8:
|
||||
base-6-ubuntu-create-releases:
|
||||
- step:
|
||||
services:
|
||||
- docker
|
||||
@ -13,8 +13,19 @@ pipelines:
|
||||
- export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
|
||||
- export MAC_PRODUCT_KEY='confluence'
|
||||
- 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
|
||||
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:
|
||||
base-6-adoptopenjdk8:
|
||||
- step:
|
||||
@ -27,5 +38,5 @@ pipelines:
|
||||
- export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
|
||||
- export MAC_PRODUCT_KEY='confluence'
|
||||
- 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
|
Loading…
Reference in New Issue
Block a user