Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to 7.3.1 #53

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM adoptopenjdk/openjdk8:alpine
MAINTAINER Steffen Bleul <[email protected]>

ARG BITBUCKET_VERSION=6.8.2
ARG BITBUCKET_VERSION=7.3.1
# permissions
ARG CONTAINER_UID=1000
ARG CONTAINER_GID=1000
Expand Down Expand Up @@ -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 && \
Expand Down
36 changes: 18 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@

| 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

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

Expand All @@ -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
Expand All @@ -45,15 +45,15 @@ $ 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:

~~~~
$ 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
Expand Down Expand Up @@ -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.
Expand All @@ -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.
Expand All @@ -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!
Expand All @@ -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.
Expand Down Expand Up @@ -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
~~~~

Expand All @@ -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`.
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion buildscripts/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#------------------
# CONTAINER VARIABLES
#------------------
export BITBUCKET_VERSION=6.8.2
export BITBUCKET_VERSION=7.3.1

docker build -t teamatldocker/bitbucket .

Expand Down
13 changes: 7 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3'

services:
bitbucket:
image: blacklabelops/bitbucket
image: teamatldocker/bitbucket
depends_on:
- postgres_bitbucket
networks:
Expand All @@ -18,12 +18,13 @@ services:
- 'BITBUCKET_DELAYED_START='
- 'DOCKER_WAIT_HOST=postgres_bitbucket'
- 'DOCKER_WAIT_PORT=5432'
- 'BITBUCKET_EMBEDDED_SEARCH=true'
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:
Expand All @@ -35,8 +36,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:
Expand Down