From 5d58953dc6470224a04a376aef5e604780d8ebb4 Mon Sep 17 00:00:00 2001 From: David Drinn Date: Tue, 23 Jun 2020 17:31:27 -0700 Subject: [PATCH 1/7] Dockerfile: Update Bitbucket version to 7.3.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d595984..a8267fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM adoptopenjdk/openjdk8:alpine MAINTAINER Steffen Bleul -ARG BITBUCKET_VERSION=6.8.2 +ARG BITBUCKET_VERSION=7.3.1 # permissions ARG CONTAINER_UID=1000 ARG CONTAINER_GID=1000 From 80e40e806119fbdd0fa2d5a902201454345d7894 Mon Sep 17 00:00:00 2001 From: David Drinn Date: Tue, 23 Jun 2020 17:32:23 -0700 Subject: [PATCH 2/7] Tell wget to use UTF-8 for URL Without this, wget treats the URL as ASCII and converts it to UTF-8. Theoretically that's fine, but after the third or fourth redirect, the URL gets mis-parsed and the wget fails. --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index a8267fd..eb73d36 100644 --- a/Dockerfile +++ b/Dockerfile @@ -72,6 +72,7 @@ RUN export MYSQL_DRIVER_VERSION=5.1.48 && \ RUN mkdir -p ${BITBUCKET_BACKUP_CLIENT_HOME} && \ wget -O /tmp/bitbucket-backup-distribution.zip \ + --local-encoding=utf-8 \ https://marketplace.atlassian.com/download/plugins/com.atlassian.stash.backup.client/version/${BITBUCKET_BACKUP_CLIENT_VERSION} && \ unzip -d ${BITBUCKET_BACKUP_CLIENT_HOME} /tmp/bitbucket-backup-distribution.zip && \ mv /opt/backupclient/$(ls /opt/backupclient/) /opt/backupclient/bitbucket-backup-client && \ From be2e97d118d795ca3755c50682280bc4eeaf41de Mon Sep 17 00:00:00 2001 From: David Drinn Date: Tue, 23 Jun 2020 19:48:15 -0700 Subject: [PATCH 3/7] README: Update to 7.3.1 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ff58718..d3e8152 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ | Product |Version | Tags | Dockerfile | |---------|--------|-------|------------| -| Bitbucket | 6.8.2 | 6.8.2, latest | [Dockerfile](https://github.com/blacklabelops/bitbucket/blob/master/Dockerfile) | +| Bitbucket | 7.3.1 | 7.3.1, latest | [Dockerfile](https://github.com/teamatldocker/bitbucket/blob/master/Dockerfile) | ## Related Images From e71dfc394adf22dde551769b6eaf70077662fea6 Mon Sep 17 00:00:00 2001 From: David Drinn Date: Tue, 23 Jun 2020 19:48:39 -0700 Subject: [PATCH 4/7] README: Update blacklabelops to teamatldocker --- README.md | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index d3e8152..86e3535 100644 --- a/README.md +++ b/README.md @@ -12,10 +12,10 @@ You may also like: -* [blacklabelops/jira](https://github.com/blacklabelops/jira): The #1 software development tool used by agile teams -* [blacklabelops/confluence](https://github.com/blacklabelops/confluence): Create, organize, and discuss work with your team -* [blacklabelops/bitbucket](https://github.com/blacklabelops/bitbucket): Code, Manage, Collaborate -* [blacklabelops/crowd](https://github.com/blacklabelops/crowd): Identity management for web apps +* [teamatldocker/jira](https://github.com/teamatldocker/jira): The #1 software development tool used by agile teams +* [teamatldocker/confluence](https://github.com/teamatldocker/confluence): Create, organize, and discuss work with your team +* [teamatldocker/bitbucket](https://github.com/teamatldocker/bitbucket): Code, Manage, Collaborate +* [teamatldocker/crowd](https://github.com/teamatldocker/crowd): Identity management for web apps # Make It Short @@ -24,7 +24,7 @@ Docker-CLI: Just type and follow the manual installation procedure in your browser: ~~~~ -$ docker run -d -p 7990:7990 --name bitbucket blacklabelops/bitbucket +$ docker run -d -p 7990:7990 --name bitbucket teamatldocker/bitbucket ~~~~ > Point your browser to http://yourdockerhost:7990 @@ -45,7 +45,7 @@ $ docker run --name postgres_bitbucket -d \ -e 'POSTGRES_USER=bitbucketdb' \ -e 'POSTGRES_PASSWORD=jellyfish' \ -e 'POSTGRES_ENCODING=UTF8' \ - blacklabelops/postgres + postgres:9.5-alpine ~~~~ Secondly, start Bitbucket: @@ -53,7 +53,7 @@ Secondly, start Bitbucket: ~~~~ $ docker run -d --name bitbucket \ --link postgres_bitbucket:postgres_bitbucket \ - -p 7990:7990 blacklabelops/bitbucket + -p 7990:7990 teamatldocker/bitbucket ~~~~ > Starts Crowd and links it to the postgresql instances. JDBC URL: jdbc:postgresql://postgres_bitbucket/bitbucketdb @@ -83,7 +83,7 @@ $ docker run -d --name bitbucket \ -v your-local-folder-or-volume:/var/atlassian/bitbucket \ -e "BITBUCKET_EMBEDDED_SEARCH=true" \ -p 7990:7990 \ - blacklabelops/bitbucket /opt/bitbucket/bin/start-bitbucket.sh -fg + teamatldocker/bitbucket /opt/bitbucket/bin/start-bitbucket.sh -fg ~~~~ > A separate java process for Elasticsearch will be started. @@ -108,7 +108,7 @@ First start the polling container: $ docker run -d --name bitbucket \ -e "DOCKER_WAIT_HOST=your_postgres_host" \ -e "DOCKER_WAIT_PORT=5432" \ - -p 80:8090 blacklabelops/bitbucket + -p 80:8090 teamatldocker/bitbucket ~~~~ > Waits at most 60 seconds for the database. @@ -125,7 +125,7 @@ $ docker run --name postgres -d \ -e 'POSTGRES_ENCODING=UNICODE' \ -e 'POSTGRES_COLLATE=C' \ -e 'POSTGRES_COLLATE_TYPE=C' \ - blacklabelops/postgres + postgres:9.5-alpine ~~~~ > Bitbucket will start after postgres is available! @@ -144,7 +144,7 @@ $ docker run -d --name bitbucket \ -e "BITBUCKET_PROXY_NAME=myhost.example.com" \ -e "BITBUCKET_PROXY_PORT=443" \ -e "BITBUCKET_PROXY_SCHEME=https" \ - blacklabelops/bitbucket + teamatldocker/bitbucket ~~~~ > ssh keys will be copied and are available at runtime. @@ -211,7 +211,7 @@ $ docker run --rm --name bitbucket_backup \ -e "BITBUCKET_BASEURL=http://yourbitbucketserverurl:yourport" \ -e "BITBUCKET_USER=youradmin" \ -e "BITBUCKET_PASSWORD=yourpassword" \ - blacklabelops/bitbucket \ + teamatldocker/bitbucket \ java -jar /opt/backupclient/bitbucket-backup-client/bitbucket-backup-client.jar ~~~~ @@ -228,7 +228,7 @@ $ docker run -d \ -e "JVM_MINIMUM_MEMORY=2g" \ -e "JVM_MAXIMUM_MEMORY=3g" \ -p 7990:7990 \ - blacklabelops/bitbucket + teamatldocker/bitbucket ~~~~ This will start Bitbucket with `-Xms=2g -Xmx=3g`. @@ -254,7 +254,7 @@ $ docker run -d --name bitbucket \ -e "BITBUCKET_PROXY_NAME=myhost.example.com" \ -e "BITBUCKET_PROXY_PORT=443" \ -e "BITBUCKET_PROXY_SCHEME=https" \ - blacklabelops/bitbucket + teamatldocker/bitbucket ~~~~ > Will set the values inside the bitbucket.properties in /var/atlassian/bitbucket/bitbucket.properties @@ -271,7 +271,7 @@ $ docker run -d --name bitbucket \ -e "BITBUCKET_PROXY_NAME=myhost.example.com" \ -e "BITBUCKET_PROXY_PORT=80" \ -e "BITBUCKET_PROXY_SCHEME=http" \ - blacklabelops/bitbucket + teamatldocker/bitbucket ~~~~ > Example with dockertools @@ -305,7 +305,7 @@ $ docker run -d --name bitbucket \ -e "BITBUCKET_PROXY_NAME=192.168.99.100" \ -e "BITBUCKET_PROXY_PORT=80" \ -e "BITBUCKET_PROXY_SCHEME=http" \ - blacklabelops/bitbucket + teamatldocker/bitbucket ~~~~ > Example with dockertools @@ -361,7 +361,7 @@ Example: ~~~~ $ docker run -d -p 7990:7990 -v your-local-folder-or-volume:/var/atlassian/bitbucket \ -e "BITBUCKET_CROWD_SSO=true" \ - --name bitbucket blacklabelops/bitbucket + --name bitbucket teamatldocker/bitbucket ~~~~ > SSO will be activated, you will need Crowd in order to authenticate. From 2f7cba79b19327723e4163fd301f00096e3bc39f Mon Sep 17 00:00:00 2001 From: David Drinn Date: Tue, 23 Jun 2020 19:49:03 -0700 Subject: [PATCH 5/7] Release script: Update to 7.3.1 --- buildscripts/release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildscripts/release.sh b/buildscripts/release.sh index 7830e27..1f3cbd4 100755 --- a/buildscripts/release.sh +++ b/buildscripts/release.sh @@ -3,7 +3,7 @@ #------------------ # CONTAINER VARIABLES #------------------ -export BITBUCKET_VERSION=6.8.2 +export BITBUCKET_VERSION=7.3.1 docker build -t teamatldocker/bitbucket . From af577c5ed1cb21e7dda17c0ff48c35b8c64aa08e Mon Sep 17 00:00:00 2001 From: David Drinn Date: Tue, 23 Jun 2020 19:53:19 -0700 Subject: [PATCH 6/7] Docker-compose: Update to teamatldocker --- docker-compose.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 006440c..73e4c1e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: bitbucket: - image: blacklabelops/bitbucket + image: teamatldocker/bitbucket depends_on: - postgres_bitbucket networks: @@ -19,11 +19,11 @@ services: - 'DOCKER_WAIT_HOST=postgres_bitbucket' - 'DOCKER_WAIT_PORT=5432' labels: - com.blacklabelops.description: "Atlassian Bitbucket" - com.blacklabelops.service: "bitbucket" + com.teamatldocker.description: "Atlassian Bitbucket" + com.teamatldocker.service: "bitbucket" postgres_bitbucket: - image: blacklabelops/postgres + image: postgres:9.5-alpine networks: - bitbucketnet volumes: @@ -35,8 +35,8 @@ services: - 'POSTGRES_DB=bitbucketdb' - 'POSTGRES_ENCODING=UTF8' labels: - com.blacklabelops.description: "PostgreSQL Database Server" - com.blacklabelops.service: "postgresql" + com.teamatldocker.description: "PostgreSQL Database Server" + com.teamatldocker.service: "postgresql" volumes: bitbucketdata: From 1eb6aee7076e55a84fa8602568655722d6a440a8 Mon Sep 17 00:00:00 2001 From: David Drinn Date: Tue, 23 Jun 2020 19:57:37 -0700 Subject: [PATCH 7/7] Docker-compose: Turn on elastic search --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 73e4c1e..17d56ab 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,6 +18,7 @@ services: - 'BITBUCKET_DELAYED_START=' - 'DOCKER_WAIT_HOST=postgres_bitbucket' - 'DOCKER_WAIT_PORT=5432' + - 'BITBUCKET_EMBEDDED_SEARCH=true' labels: com.teamatldocker.description: "Atlassian Bitbucket" com.teamatldocker.service: "bitbucket"