diff --git a/Dockerfile-alpine b/Dockerfile-alpine deleted file mode 100644 index 7b77ee3..0000000 --- a/Dockerfile-alpine +++ /dev/null @@ -1,63 +0,0 @@ -ARG BASE_IMAGE=adoptopenjdk/openjdk8:alpine -FROM $BASE_IMAGE - -LABEL maintainer="dc-deployments@atlassian.com" -LABEL securitytxt="https://www.atlassian.com/.well-known/security.txt" - -ENV RUN_USER confluence -ENV RUN_GROUP confluence -ENV RUN_UID 2002 -ENV RUN_GID 2002 - -# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html -ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence -ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence - -WORKDIR $CONFLUENCE_HOME - -# Expose HTTP and Synchrony ports -EXPOSE 8090 -EXPOSE 8091 - -CMD ["/entrypoint.py"] -ENTRYPOINT ["/sbin/tini", "--"] - -RUN apk update \ - && apk upgrade \ - && apk add --no-cache ca-certificates wget curl openssh bash procps openssl perl tini python3 py3-jinja2 ttf-dejavu `apk search -qe 'font-noto*'` \ - && rm -f /var/cache/apk/APKINDEX* - -# Workaround for AdoptOpenJDK Alpine fontconfig bug -RUN ln -s /usr/lib/libfontconfig.so.1 /usr/lib/libfontconfig.so \ - && ln -s /lib/libuuid.so.1 /usr/lib/libuuid.so.1 \ - && ln -s /lib/libc.musl-x86_64.so.1 /usr/lib/libc.musl-x86_64.so.1 -ENV LD_LIBRARY_PATH /usr/lib - -ARG CONFLUENCE_VERSION -ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/confluence/downloads/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz - -RUN addgroup -g ${RUN_GID} ${RUN_GROUP} \ - && adduser -u ${RUN_UID} -G ${RUN_GROUP} -h ${CONFLUENCE_HOME} -s /bin/bash -D ${RUN_USER} \ - \ - && mkdir -p ${CONFLUENCE_INSTALL_DIR} \ - && curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${CONFLUENCE_INSTALL_DIR}" \ - && chmod -R "u=rwX,g=rX,o=rX" ${CONFLUENCE_INSTALL_DIR}/ \ - && chown -R root. ${CONFLUENCE_INSTALL_DIR}/ \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_INSTALL_DIR}/logs \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_INSTALL_DIR}/temp \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_INSTALL_DIR}/work \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_HOME} \ - \ - && sed -i -e 's/-Xms\([0-9]\+[kmg]\) -Xmx\([0-9]\+[kmg]\)/-Xms\${JVM_MINIMUM_MEMORY:=\1} -Xmx\${JVM_MAXIMUM_MEMORY:=\2} -Dconfluence.home=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/-XX:ReservedCodeCacheSize=\([0-9]\+[kmg]\)/-XX:ReservedCodeCacheSize=${JVM_RESERVED_CODE_CACHE_SIZE:=\1}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \ - && sed -i -e 's/export CATALINA_OPTS/CATALINA_OPTS="\${CATALINA_OPTS} \${JVM_SUPPORT_RECOMMENDED_ARGS}"\n\nexport CATALINA_OPTS/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \ - \ - && mkdir -p /opt/java/openjdk/lib/fonts/fallback/ \ - && ln -sf /usr/share/fonts/noto/* /opt/java/openjdk/lib/fonts/fallback/ - -VOLUME ["${CONFLUENCE_HOME}"] # Must be declared after setting perms - -COPY entrypoint.py \ - shared-components/image/entrypoint_helpers.py / -COPY shared-components/support /opt/atlassian/support -COPY config/* /opt/atlassian/etc/ diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 3589580..4ad5ab9 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -27,294 +27,6 @@ pipelines: - parallel: - - step: - name: Confluence Alpine JDK 8 - Batch 1 - services: - - docker - script: - - git submodule update --init --recursive - - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - - > - python /usr/src/app/make-releases.py \ - --update \ - --start-version='6' \ - --end-version='7' \ - --dockerfile='Dockerfile-alpine' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='alpine,alpine-adoptopenjdk8' \ - --concurrent-builds='1' \ - --job-offset='0' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - - step: - name: Confluence Alpine JDK 8 - Batch 2 - services: - - docker - script: - - git submodule update --init --recursive - - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - - > - python /usr/src/app/make-releases.py \ - --update \ - --start-version='6' \ - --end-version='7' \ - --dockerfile='Dockerfile-alpine' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='alpine,alpine-adoptopenjdk8' \ - --concurrent-builds='1' \ - --job-offset='1' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - - step: - name: Confluence Alpine JDK 8 - Batch 3 - services: - - docker - script: - - git submodule update --init --recursive - - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - - > - python /usr/src/app/make-releases.py \ - --update \ - --start-version='6' \ - --end-version='7' \ - --dockerfile='Dockerfile-alpine' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='alpine,alpine-adoptopenjdk8' \ - --concurrent-builds='1' \ - --job-offset='2' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - - step: - name: Confluence Alpine JDK 8 - Batch 4 - services: - - docker - script: - - git submodule update --init --recursive - - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - - > - python /usr/src/app/make-releases.py \ - --update \ - --start-version='6' \ - --end-version='7' \ - --dockerfile='Dockerfile-alpine' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='alpine,alpine-adoptopenjdk8' \ - --concurrent-builds='1' \ - --job-offset='3' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - - step: - name: Confluence Alpine JDK 8 - Batch 5 - services: - - docker - script: - - git submodule update --init --recursive - - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - - > - python /usr/src/app/make-releases.py \ - --update \ - --start-version='6' \ - --end-version='7' \ - --dockerfile='Dockerfile-alpine' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='alpine,alpine-adoptopenjdk8' \ - --concurrent-builds='1' \ - --job-offset='4' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - - step: - name: Confluence Alpine JDK 8 - Batch 6 - services: - - docker - script: - - git submodule update --init --recursive - - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - - > - python /usr/src/app/make-releases.py \ - --update \ - --start-version='6' \ - --end-version='7' \ - --dockerfile='Dockerfile-alpine' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='alpine,alpine-adoptopenjdk8' \ - --concurrent-builds='1' \ - --job-offset='5' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - - step: - name: Confluence Alpine JDK 8 - Batch 7 - services: - - docker - script: - - git submodule update --init --recursive - - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - - > - python /usr/src/app/make-releases.py \ - --update \ - --start-version='6' \ - --end-version='7' \ - --dockerfile='Dockerfile-alpine' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='alpine,alpine-adoptopenjdk8' \ - --concurrent-builds='1' \ - --job-offset='6' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - - step: - name: Confluence Alpine JDK 8 - Batch 8 - services: - - docker - script: - - git submodule update --init --recursive - - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - - > - python /usr/src/app/make-releases.py \ - --update \ - --start-version='6' \ - --end-version='7' \ - --dockerfile='Dockerfile-alpine' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='alpine,alpine-adoptopenjdk8' \ - --concurrent-builds='1' \ - --job-offset='7' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - - step: - name: Confluence Alpine JDK 8 - Batch 9 - services: - - docker - script: - - git submodule update --init --recursive - - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - - > - python /usr/src/app/make-releases.py \ - --update \ - --start-version='6' \ - --end-version='7' \ - --dockerfile='Dockerfile-alpine' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='alpine,alpine-adoptopenjdk8' \ - --concurrent-builds='1' \ - --job-offset='8' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - - step: - name: Confluence Alpine JDK 8 - Batch 10 - services: - - docker - script: - - git submodule update --init --recursive - - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - - > - python /usr/src/app/make-releases.py \ - --update \ - --start-version='6' \ - --end-version='7' \ - --dockerfile='Dockerfile-alpine' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='alpine,alpine-adoptopenjdk8' \ - --concurrent-builds='1' \ - --job-offset='9' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - - step: - name: Confluence Alpine JDK 8 - Batch 11 - services: - - docker - script: - - git submodule update --init --recursive - - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - - > - python /usr/src/app/make-releases.py \ - --update \ - --start-version='6' \ - --end-version='7' \ - --dockerfile='Dockerfile-alpine' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='alpine,alpine-adoptopenjdk8' \ - --concurrent-builds='1' \ - --job-offset='10' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - - step: - name: Confluence Alpine JDK 8 - Batch 12 - services: - - docker - script: - - git submodule update --init --recursive - - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - - > - python /usr/src/app/make-releases.py \ - --update \ - --start-version='6' \ - --end-version='7' \ - --dockerfile='Dockerfile-alpine' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='alpine,alpine-adoptopenjdk8' \ - --concurrent-builds='1' \ - --job-offset='11' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - step: name: Confluence Ubuntu JDK 8 - Batch 1 services: @@ -934,306 +646,6 @@ pipelines: - parallel: - - step: - name: Confluence Alpine JDK 8 - Batch 1 - services: - - docker - script: - - git submodule update --init --recursive - - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - - > - python /usr/src/app/make-releases.py \ - --create \ - --create-eap \ - --start-version='6' \ - --end-version='7' \ - --dockerfile='Dockerfile-alpine' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='alpine,alpine-adoptopenjdk8' \ - --concurrent-builds='1' \ - --job-offset='0' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - - step: - name: Confluence Alpine JDK 8 - Batch 2 - services: - - docker - script: - - git submodule update --init --recursive - - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - - > - python /usr/src/app/make-releases.py \ - --create \ - --create-eap \ - --start-version='6' \ - --end-version='7' \ - --dockerfile='Dockerfile-alpine' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='alpine,alpine-adoptopenjdk8' \ - --concurrent-builds='1' \ - --job-offset='1' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - - step: - name: Confluence Alpine JDK 8 - Batch 3 - services: - - docker - script: - - git submodule update --init --recursive - - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - - > - python /usr/src/app/make-releases.py \ - --create \ - --create-eap \ - --start-version='6' \ - --end-version='7' \ - --dockerfile='Dockerfile-alpine' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='alpine,alpine-adoptopenjdk8' \ - --concurrent-builds='1' \ - --job-offset='2' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - - step: - name: Confluence Alpine JDK 8 - Batch 4 - services: - - docker - script: - - git submodule update --init --recursive - - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - - > - python /usr/src/app/make-releases.py \ - --create \ - --create-eap \ - --start-version='6' \ - --end-version='7' \ - --dockerfile='Dockerfile-alpine' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='alpine,alpine-adoptopenjdk8' \ - --concurrent-builds='1' \ - --job-offset='3' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - - step: - name: Confluence Alpine JDK 8 - Batch 5 - services: - - docker - script: - - git submodule update --init --recursive - - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - - > - python /usr/src/app/make-releases.py \ - --create \ - --create-eap \ - --start-version='6' \ - --end-version='7' \ - --dockerfile='Dockerfile-alpine' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='alpine,alpine-adoptopenjdk8' \ - --concurrent-builds='1' \ - --job-offset='4' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - - step: - name: Confluence Alpine JDK 8 - Batch 6 - services: - - docker - script: - - git submodule update --init --recursive - - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - - > - python /usr/src/app/make-releases.py \ - --create \ - --create-eap \ - --start-version='6' \ - --end-version='7' \ - --dockerfile='Dockerfile-alpine' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='alpine,alpine-adoptopenjdk8' \ - --concurrent-builds='1' \ - --job-offset='5' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - - step: - name: Confluence Alpine JDK 8 - Batch 7 - services: - - docker - script: - - git submodule update --init --recursive - - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - - > - python /usr/src/app/make-releases.py \ - --create \ - --create-eap \ - --start-version='6' \ - --end-version='7' \ - --dockerfile='Dockerfile-alpine' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='alpine,alpine-adoptopenjdk8' \ - --concurrent-builds='1' \ - --job-offset='6' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - - step: - name: Confluence Alpine JDK 8 - Batch 8 - services: - - docker - script: - - git submodule update --init --recursive - - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - - > - python /usr/src/app/make-releases.py \ - --create \ - --create-eap \ - --start-version='6' \ - --end-version='7' \ - --dockerfile='Dockerfile-alpine' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='alpine,alpine-adoptopenjdk8' \ - --concurrent-builds='1' \ - --job-offset='7' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - - step: - name: Confluence Alpine JDK 8 - Batch 9 - services: - - docker - script: - - git submodule update --init --recursive - - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - - > - python /usr/src/app/make-releases.py \ - --create \ - --create-eap \ - --start-version='6' \ - --end-version='7' \ - --dockerfile='Dockerfile-alpine' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='alpine,alpine-adoptopenjdk8' \ - --concurrent-builds='1' \ - --job-offset='8' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - - step: - name: Confluence Alpine JDK 8 - Batch 10 - services: - - docker - script: - - git submodule update --init --recursive - - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - - > - python /usr/src/app/make-releases.py \ - --create \ - --create-eap \ - --start-version='6' \ - --end-version='7' \ - --dockerfile='Dockerfile-alpine' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='alpine,alpine-adoptopenjdk8' \ - --concurrent-builds='1' \ - --job-offset='9' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - - step: - name: Confluence Alpine JDK 8 - Batch 11 - services: - - docker - script: - - git submodule update --init --recursive - - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - - > - python /usr/src/app/make-releases.py \ - --create \ - --create-eap \ - --start-version='6' \ - --end-version='7' \ - --dockerfile='Dockerfile-alpine' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='alpine,alpine-adoptopenjdk8' \ - --concurrent-builds='1' \ - --job-offset='10' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - - step: - name: Confluence Alpine JDK 8 - Batch 12 - services: - - docker - script: - - git submodule update --init --recursive - - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - - > - python /usr/src/app/make-releases.py \ - --create \ - --create-eap \ - --start-version='6' \ - --end-version='7' \ - --dockerfile='Dockerfile-alpine' \ - --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine' \ - --dockerfile-version-arg='CONFLUENCE_VERSION' \ - --mac-product-key='confluence' \ - --tag-suffixes='alpine,alpine-adoptopenjdk8' \ - --concurrent-builds='1' \ - --job-offset='11' \ - --jobs-total='12' \ - --docker-repos='atlassian/confluence,atlassian/confluence-server' \ - --push - - - step: name: Confluence Ubuntu JDK 8 - Batch 1 services: @@ -1897,9 +1309,6 @@ pipelines: - export MAC_PRODUCT_KEY='confluence' - py.test -v tests/ - py.test -v shared-components/tests/ - - export DOCKERFILE='Dockerfile-alpine' - - py.test -v tests/ - - py.test -v shared-components/tests/ - step: name: Run integration tests services: diff --git a/bitbucket-pipelines.yml.j2 b/bitbucket-pipelines.yml.j2 index c07879a..e6c0d49 100644 --- a/bitbucket-pipelines.yml.j2 +++ b/bitbucket-pipelines.yml.j2 @@ -152,9 +152,6 @@ pipelines: - export MAC_PRODUCT_KEY='confluence' - py.test -v tests/ - py.test -v shared-components/tests/ - - export DOCKERFILE='Dockerfile-alpine' - - py.test -v tests/ - - py.test -v shared-components/tests/ - step: name: Run integration tests services: diff --git a/pipelines-generator.py b/pipelines-generator.py index 74cefcf..46bc75b 100755 --- a/pipelines-generator.py +++ b/pipelines-generator.py @@ -7,17 +7,6 @@ TEMPLATE_FILE = 'bitbucket-pipelines.yml.j2' REPOS = ['atlassian/confluence', 'atlassian/confluence-server'] images = { - 'Confluence Alpine': { - 8: { - 'start_version': '6', - 'end_version': '7', - 'default_release': False, - 'base_image': 'adoptopenjdk/openjdk8:alpine', - 'tag_suffixes': ['alpine','alpine-adoptopenjdk8'], - 'dockerfile': 'Dockerfile-alpine', - 'docker_repos': REPOS, - }, - }, 'Confluence Ubuntu': { 8: { 'start_version': '6',