diff --git a/.travis.yml b/.travis.yml index f5e546516..8581131f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -175,10 +175,7 @@ matrix: - docker build --compress -t epicmorg/bitbucket:6.0.7 atlassian/bitbucket/6.0.7 - docker push epicmorg/bitbucket:6.0.7 - - - docker build --compress -t epicmorg/bitbucket:6.0.8 atlassian/bitbucket/6.0.8 - - docker push epicmorg/bitbucket:6.0.8 - + - docker build --compress -t epicmorg/bitbucket:6.0.9 atlassian/bitbucket/6.0.9 - docker push epicmorg/bitbucket:6.0.9 diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b52734e1..4b3846dc0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ## Changelog -* `January 2020` (01/13/2020 - 01/16/2020) +* `January 2020` (01/13/2020 - 01/17/2020) * separated `base` images to `prod`, `prod:jdk8`, `prod:jdk11`, `devel`, `devel:jdk8`, `devel:jdk11` * teamcity - `devel:jdk11` * updated current atlassian contaners: @@ -19,7 +19,7 @@ * added `Jira 7.7.x`: `7.7.0`, `7.7.1`, `7.7.2`, `7.7.4` * added `Jira 7.8.x`: `7.8.0`, `7.8.1`, `7.8.2`, `7.8.4` * added `Jira 7.9.x`: `7.9.0`, `7.9.2` - * added `Bitbucket 6.0.x`: `6.0.0`, `6.0.1`, `6.0.2`, `6.0.3`, `6.0.4`, `6.0.5`, `6.0.6`, `6.0.7`, `6.0.8`, `6.0.9`, `6.0.10`, `6.0.11` + * added `Bitbucket 6.0.x`: `6.0.0`, `6.0.1`, `6.0.2`, `6.0.3`, `6.0.4`, `6.0.5`, `6.0.6`, `6.0.7`, `6.0.9`, `6.0.10`, `6.0.11` * added `Bitbucket 6.1.x`: `6.1.0`, `6.1.1`, `6.1.2`, `6.1.3`, `6.1.4`, `6.1.5`, `6.1.6`, `6.1.7`, `6.1.8`, `6.1.9` * added `Bitbucket 6.2.x`: `6.2.2`, `6.2.3`, `6.2.4`, `6.2.5`, `6.2.6`, `6.2.7` * added `Bitbucket 6.3.x`: `6.3.3`, `6.3.4`, `6.3.5`, `6.3.6` @@ -47,6 +47,7 @@ * `Atlassian` stack separated to 2 branches: * jdk8-based (default for all images) * jdk11-based for new images (by special `-jdk11` tag) + * optimized final containers which uses `devel` base * 12/13/2019 * updated `teamcity agent`. added `php 7.3` support. * fixed `nginx` image. diff --git a/atlassian/bitbucket/6.0.8/.docker-repository.yml b/atlassian/bitbucket/6.0.8/.docker-repository.yml deleted file mode 100644 index 6a0e5da83..000000000 --- a/atlassian/bitbucket/6.0.8/.docker-repository.yml +++ /dev/null @@ -1 +0,0 @@ -repository: epicmorg/bitbucket diff --git a/atlassian/bitbucket/6.0.8/.dockerignore b/atlassian/bitbucket/6.0.8/.dockerignore deleted file mode 100644 index f5523d40c..000000000 --- a/atlassian/bitbucket/6.0.8/.dockerignore +++ /dev/null @@ -1,3 +0,0 @@ -.git -scripts -.idea diff --git a/atlassian/bitbucket/6.0.8/Dockerfile b/atlassian/bitbucket/6.0.8/Dockerfile deleted file mode 100644 index ba2e26bba..000000000 --- a/atlassian/bitbucket/6.0.8/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM epicmorg/prod:jdk11 -LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# ARGuments -################################################################## -ARG BITBUCKET_VERSION=6.0.8 -ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz - -################################################################## -# Setup -################################################################## -ENV RUN_USER daemon -ENV RUN_GROUP daemon - -# https://confluence.atlassian.com/display/BitbucketServer/Bitbucket+Server+home+directory -ENV BITBUCKET_HOME /var/atlassian/application-data/bitbucket -ENV BITBUCKET_INSTALL_DIR /opt/atlassian/bitbucket - -VOLUME ["${BITBUCKET_HOME}"] -WORKDIR $BITBUCKET_HOME - -# Expose HTTP and SSH ports -EXPOSE 7990 -EXPOSE 7999 - -################################################################## -# Installing -################################################################## -RUN mkdir -p ${BITBUCKET_INSTALL_DIR} \ - && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \ - && chown -R ${RUN_USER}:${RUN_GROUP} ${BITBUCKET_INSTALL_DIR}/ \ - && sed -i -e 's/^# umask/umask/' ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \ - - update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ - apt clean -y && \ - apt autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb - -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] -COPY entrypoint.sh /entrypoint.sh -COPY . /tmp diff --git a/atlassian/bitbucket/6.0.8/Makefile b/atlassian/bitbucket/6.0.8/Makefile deleted file mode 100644 index 0b332c38d..000000000 --- a/atlassian/bitbucket/6.0.8/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -all: bitbucket - -bitbucket: - docker build --compress -t epicmorg/bitbucket:6.0.8 . diff --git a/atlassian/bitbucket/6.0.8/README.md b/atlassian/bitbucket/6.0.8/README.md deleted file mode 100644 index b60c42068..000000000 --- a/atlassian/bitbucket/6.0.8/README.md +++ /dev/null @@ -1,216 +0,0 @@ -![Atlassian Bitbucket Server](https://www.atlassian.com/dam/wac/legacy/bitbucket_logo_landing.png) - -Bitbucket Server is an on-premises source code management solution for Git that's secure, fast, and enterprise grade. Create and manage repositories, set up fine-grained permissions, and collaborate on code - all with the flexibility of your servers. - -Learn more about Bitbucket Server: - -# Overview - -This Docker container makes it easy to get an instance of Bitbucket up and running. - -** We strongly recommend you run this image using a specific version tag instead of latest. This is because the image referenced by the latest tag changes often and we cannot guarantee that it will be backwards compatible. ** - -# Quick Start - -For the `BITBUCKET_HOME` directory that is used to store the repository data -(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/engine/tutorials/dockervolumes/#/data-volumes), or via a named volume if using a docker version >= 1.9. - -Volume permission is managed by entry scripts. To get started you can use a data volume, or named volumes. In this example we'll use named volumes. - - $> docker volume create --name bitbucketVolume - $> docker run -v bitbucketVolume:/var/atlassian/application-data/bitbucket --name="bitbucket" -d -p 7990:7990 -p 7999:7999 atlassian/bitbucket-server - -Note that this command can substitute folder paths with named volumes. - -Start Atlassian Bitbucket Server: - - $> docker run -v /data/bitbucket:/var/atlassian/application-data/bitbucket --name="bitbucket" -d -p 7990:7990 -p 7999:7999 atlassian/bitbucket-server - -**Success**. Bitbucket is now available on [http://localhost:7990](http://localhost:7990)* - -Please ensure your container has the necessary resources allocated to it. -We recommend 2GiB of memory allocated to accommodate both the application server -and the git processes. -See [Supported Platforms](https://confluence.atlassian.com/display/BitbucketServer/Supported+platforms) for further information. - - -_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):7990` instead._ - -## Reverse Proxy Settings - -If Bitbucket is run behind a reverse proxy server as [described here](https://confluence.atlassian.com/bitbucketserver/proxying-and-securing-bitbucket-server-776640099.html), -then you need to specify extra options to make bitbucket aware of the setup. They can be controlled via the below -environment variables. - -### Bitbucket Server 5.0 + - -Due to the migration to Spring Boot in 5.0, there are changes to how you set up Bitbucket to run behind a reverse proxy. - -In this example, we'll use an environment file. You can also do this via [specifying each environment variable](https://docs.docker.com/engine/reference/run/#env-environment-variables) via the `-e` argument in `docker run`. - -#### secure-bitbucket.env -``` -SERVER_SECURE=true -SERVER_SCHEME=https -SERVER_PROXY_PORT=443 -SERVER_PROXY_NAME= -``` - -Then you run Bitbucket as usual - -`docker run -v bitbucketVolume:/var/atlassian/application-data/bitbucket --name="bitbucket" -d -p 7990:7990 -p 7999:7999 --env-file=/path/to/env/file/secure-bitbucket.env atlassian/bitbucket-server:5.0` - -### Bitbucket Server < 5.0 - -To set the reverse proxy arguments, you specify the following as environment variables in the `docker run` command - -* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE) - - The reverse proxy's fully qualified hostname. - -* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE) - - The reverse proxy's port number via which bitbucket is accessed. - -* `CATALINA_CONNECTOR_SCHEME` (default: http) - - The protocol via which bitbucket is accessed. - -* `CATALINA_CONNECTOR_SECURE` (default: false) - - Set 'true' if CATALINA\_CONNECTOR\_SCHEME is 'https'. - -## JVM Configuration (Bitbucket Server 5.0 + only) - -If you need to override Bitbucket Server's default memory configuration or pass additional JVM arguments, use the environment variables below - -* `JVM_MINIMUM_MEMORY` (default: 512m) - - The minimum heap size of the JVM - -* `JVM_MAXIMUM_MEMORY` (default: 1024m) - - The maximum heap size of the JVM - -* `JVM_SUPPORT_RECOMMENDED_ARGS` (default: NONE) - - Additional JVM arguments for Bitbucket Server, such as a custom Java Trust Store - -## Application Mode Settings (Bitbucket Server 5.0 + only) - -This docker image can be run as a [Smart Mirror](https://confluence.atlassian.com/bitbucketserver/smart-mirroring-776640046.html) or as part of a [Data Center](https://confluence.atlassian.com/enterprise/bitbucket-data-center-668468332.html) cluster. -You can specify the following properties to start Bitbucket as a mirror or as a Data Center node: - -* `ELASTICSEARCH_ENABLED` (default: true) - - Set 'false' to prevent Elasticsearch from starting in the container. This should be used if Elasticsearch is running remotely, e.g. for if Bitbucket is running in a Data Center cluster - -* `APPLICATION_MODE` (default: default) - - The mode Bitbucket will run in. This can be set to 'mirror' to start Bitbucket as a Smart Mirror. This will also disable Elasticsearch even if `ELASTICSEARCH_ENABLED` has not been set to 'false'. - -* `HAZELCAST_NETWORK_MULTICAST` (default: false) - - Data Center: Set 'true' to enable Bitbucket to find new Data Center cluster members via multicast. `HAZELCAST_NETWORK_TCPIP` should not be specified when using this setting. - -* `HAZELCAST_NETWORK_TCPIP` (default: false) - - Data Center: Set 'true' to enable Bitbucket to find new Data Center cluster members via TCPIP. This setting requires `HAZELCAST_NETWORK_TCPIP_MEMBERS` to be specified. `HAZELCAST_NETWORK_MULTICAST` should not be specified when using this setting. - -* `HAZELCAST_NETWORK_TCPIP_MEMBERS` - - Data Center: List of members that Hazelcast nodes should connect to when HAZELCAST_NETWORK_TCPIP is 'true' - -* `HAZELCAST_GROUP_NAME` - - Data Center: Specifies the cluster group the instance should join. - -* `HAZELCAST_GROUP_PASSWORD` - - Data Center: The password required to join the specified cluster group. - -To run Bitbucket as part of a Data Center cluster, create a Docker network and assign the Bitbucket container a static IP. - -Note: Docker networks may support multicast, however the below example shows configuration using TCPIP. - - $> docker network create --driver bridge --subnet=172.18.0.0/16 myBitbucketNetwork - $> docker run --network=myBitbucketNetwork --ip=172.18.1.1 -e ELASTICSEARCH_ENABLED=false \ - -e HAZELCAST_NETWORK_TCPIP=true -e HAZELCAST_NETWORK_TCPIP_MEMBERS=172.18.1.1:5701,172.18.1.2:5701,172.18.1.3:5701 \ - -e HAZELCAST_GROUP_NAME=bitbucket -e HAZELCAST_GROUP_PASSWORD=mysecretpassword \ - -v /data/bitbucket-shared:/var/atlassian/application-data/bitbucket/shared --name="bitbucket" -d -p 7990:7990 -p 7999:7999 atlassian/bitbucket-server - -## JMX Monitoring (Bitbucket Server 5.0 + only) - -Bitbucket Server supports detailed JMX monitoring. To enable and configure JMX, use the environment variables below. For further information on JMX configuration, see [Enabling JMX counters for performance monitoring](https://confluence.atlassian.com/bitbucketserver/enabling-jmx-counters-for-performance-monitoring-776640189.html) - -* `JMX_ENABLED` (default: false) - - Enable Bitbucket to publish JMX data - -* `JMX_REMOTE_AUTH` (default: NONE) - - Set the authentication to use for remote JMX access. This value is required: anything other than "password" or "ssl" will cause remote JMX access to be disabled - -* `JMX_REMOTE_PORT` (default: 3333) - - The port used to negotiate a JMX connection. Note: this port is only used during the initial authorization, after which a different RMI port used for data transfer - -* `JMX_REMOTE_RMI_PORT` (default: ) - - The port used for all subsequent JMX-RMI data transfer. If desired, the RMI data port can be set to the same value as `JMX_REMOTE_PORT` to allow a single port to be used for both JMX authorization and data transfer - -* `RMI_SERVER_HOSTNAME` (default: NONE) - - The hostname or IP address that clients will use to connect to the application for JMX monitoring. This must be resolvable by both clients and from the JVM host machine. - -* `JMX_PASSWORD_FILE` (default: NONE) - - The full path to the JMX username/password file used to authenticate remote JMX clients. This is required when `JMX_REMOTE_AUTH` is set to "password" - - $> docker run -e JMX_ENABLED=true -e JMX_REMOTE_AUTH=password -e JMX_REMOTE_RMI_PORT=3333 -e RMI_SERVER_HOSTNAME=bitbucket \ - -e JMX_PASSWORD_FILE=/data/bitbucket:/var/atlassian/application-data/bitbucket/jmx.access \ - -v /data/bitbucket:/var/atlassian/application-data/bitbucket --name="bitbucket" -d -p 7990:7990 -p 7999:7999 -p 3333:3333 atlassian/bitbucket-server - -# Upgrade - -To upgrade to a more recent version of Bitbucket Server you can simply stop the `bitbucket` -container and start a new one based on a more recent image: - - $> docker stop bitbucket - $> docker rm bitbucket - $> docker pull atlassian/bitbucket-server: - $> docker run ... (See above) - -As your data is stored in the data volume directory on the host it will still -be available after the upgrade. - -_Note: Please make sure that you **don't** accidentally remove the `bitbucket` -container and its volumes using the `-v` option._ - -# Backup - -For evaluations you can use the built-in database that will store its files in the Bitbucket Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/bitbucket` in the example above). - -The [Bitbucket Server Backup Client](https://confluence.atlassian.com/display/BitbucketServer/Data+recovery+and+backups) is currently not supported in the Docker setup. You can however use the [Bitbucket Server DIY Backup](https://confluence.atlassian.com/display/BitbucketServer/Using+Bitbucket+Server+DIY+Backup) approach in case you decided to use an external database. - -Read more about data recovery and backups: [https://confluence.atlassian.com/display/BitbucketServer/Data+recovery+and+backups](https://confluence.atlassian.com/display/BitbucketServer/Data+recovery+and+backups) - -# Versioning - -The `latest` tag matches the most recent version of this repository. Thus using `atlassian/bitbucket:latest` or `atlassian/bitbucket` will ensure you are running the most up to date version of this image. - -However, we ** strongly recommend ** that for non-eval workloads you select a specific version in order to prevent breaking changes from impacting your setup. -You can use a specific minor version of Bitbucket Server by using a version number -tag: `atlassian/bitbucket-server:4.14`. This will install the latest `4.14.x` version that -is available. - - -# Issue tracker - -Please raise an [issue](https://bitbucket.org/atlassian/docker-atlassian-bitbucket-server/issues) if you encounter any problems with this Dockerfile. - -# Support - -For product support, go to [support.atlassian.com](https://support.atlassian.com/) -Octotree is enabled on this page. Click this button or press cmd shift s (or ctrl shift s) to show it. -Support us • Feedback? diff --git a/atlassian/bitbucket/6.0.8/bitbucket-pipelines.yml b/atlassian/bitbucket/6.0.8/bitbucket-pipelines.yml deleted file mode 100644 index 231d79e9e..000000000 --- a/atlassian/bitbucket/6.0.8/bitbucket-pipelines.yml +++ /dev/null @@ -1,66 +0,0 @@ -image: dchevell/docker-release-maker:latest -clone: - depth: full - -pipelines: - custom: - create-release-base-5: - - step: - script: - - git remote set-url origin ${BITBUCKET_GIT_HTTP_ORIGIN} - - git fetch --all - - export BASE_BRANCH='base-5' - - export MAC_PRODUCT_KEY='bitbucket' - - export DOCKERFILE_VERSION_STRING='BITBUCKET_VERSION' - - export DEFAULT_RELEASE='true' - - export ADDITIONAL_TAG_SUFFIXES='alpine' - - python /usr/src/app/run.py --create - create-release-base-6: - - step: - script: - - git remote set-url origin ${BITBUCKET_GIT_HTTP_ORIGIN} - - git fetch --all - - export BASE_BRANCH='base-6' - - export MAC_PRODUCT_KEY='bitbucket' - - export DOCKERFILE_VERSION_STRING='BITBUCKET_VERSION' - - export DEFAULT_RELEASE='true' - - export ADDITIONAL_TAG_SUFFIXES='jdk8,ubuntu' - - python /usr/src/app/run.py --create - test: - - step: - image: docker:stable-git - script: - # Run bitbucket docker image - - mkdir -p data - - | - docker run -v $(pwd)/data:/var/atlassian/application-data/bitbucket \ - --name="bitbucket" -d -p 7990:7990 -p 7999:7999 atlassian/bitbucket-server - # Run tests - - git show origin/scripts:scripts/test-bitbucket-status.sh | install -m 0755 /dev/fd/0 test-bitbucket-status.sh - - ./test-bitbucket-status.sh - services: - - docker - - branches: - base-5: - - step: - script: - - git remote set-url origin ${BITBUCKET_GIT_HTTP_ORIGIN} - - git fetch --all - - export BASE_BRANCH='base-5' - - export MAC_PRODUCT_KEY='bitbucket' - - export DOCKERFILE_VERSION_STRING='BITBUCKET_VERSION' - - export DEFAULT_RELEASE='true' - - export ADDITIONAL_TAG_SUFFIXES='alpine' - - python /usr/src/app/run.py --update - base-6: - - step: - script: - - git remote set-url origin ${BITBUCKET_GIT_HTTP_ORIGIN} - - git fetch --all - - export BASE_BRANCH='base-6' - - export MAC_PRODUCT_KEY='bitbucket' - - export DOCKERFILE_VERSION_STRING='BITBUCKET_VERSION' - - export DEFAULT_RELEASE='true' - - export ADDITIONAL_TAG_SUFFIXES='jdk8,ubuntu' - - python /usr/src/app/run.py --update diff --git a/atlassian/bitbucket/6.0.8/entrypoint.sh b/atlassian/bitbucket/6.0.8/entrypoint.sh deleted file mode 100644 index 842224a8c..000000000 --- a/atlassian/bitbucket/6.0.8/entrypoint.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -set -euo pipefail - -# Set recommended umask of "u=,g=w,o=rwx" (0027) -umask 0027 - -export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") -export JRE_HOME="$JAVA_HOME/jre" -export JAVA_BINARY="$JRE_HOME/bin/java" -export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') - -#export PATH=$JAVA_HOME/bin:$PATH - - -# Setup Catalina Opts -: ${CATALINA_CONNECTOR_PROXYNAME:=} -: ${CATALINA_CONNECTOR_PROXYPORT:=} -: ${CATALINA_CONNECTOR_SCHEME:=http} -: ${CATALINA_CONNECTOR_SECURE:=false} - -: ${CATALINA_OPTS:=} - -: ${JAVA_OPTS:=} - -: ${ELASTICSEARCH_ENABLED:=true} -: ${APPLICATION_MODE:=} - -CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" -CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" -CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" -CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" - -JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" - -ARGS="$@" - -# Start Bitbucket without Elasticsearch -if [ "${ELASTICSEARCH_ENABLED}" == "false" ] || [ "${APPLICATION_MODE}" == "mirror" ]; then - ARGS="--no-search ${ARGS}" -fi - -# Start Bitbucket as the correct user. -if [ "${UID}" -eq 0 ]; then - echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" - PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${BITBUCKET_HOME}") - EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 - if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then - echo "Updating permissions for BITBUCKET_HOME" - mkdir -p "${BITBUCKET_HOME}/lib" && - chmod -R 700 "${BITBUCKET_HOME}" && - chown -R "${RUN_USER}:${RUN_GROUP}" "${BITBUCKET_HOME}" - fi - # Now drop privileges - exec su -s /bin/bash "${RUN_USER}" -c "${BITBUCKET_INSTALL_DIR}/bin/start-bitbucket.sh ${ARGS}" -else - exec "${BITBUCKET_INSTALL_DIR}/bin/start-bitbucket.sh" ${ARGS} -fi