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 SCALE-4-full-jdk (pull request #63)

Browse Source 
SCALE-4: Use full-JDK, as slim versions is missing jars required for some plugins, and be exlicit about Alpine version in pipelines.

Approved-by: Dave Chevell <dchevell@atlassian.com>
This commit is contained in:
Steve Smith
2020-03-23 04:26:12 +00:00
parent 4942a5d610 99745a66a1
commit d4ca94a4d7
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile-alpine
View File

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

4
bitbucket-pipelines.yml
View File

@ -31,7 +31,7 @@ pipelines:
- export END_VERSION='7.1' - 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_BUILDARGS='BASE_IMAGE=adoptopenjdk:8-hotspot'
- 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'
@ -98,7 +98,7 @@ pipelines:
- export END_VERSION='7.1' - 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_BUILDARGS='BASE_IMAGE=adoptopenjdk:8-hotspot'
- 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'