Merge branch 'update-docker' into 'master'
Update Docker configuration to 7.5.2 + minor improvements - Update to 7.5.2 - logs are now readable with `docker logs` - recommend an interactive command line for configuration See merge request !250
This commit is contained in:
commit
236741008e
|
@ -9,7 +9,7 @@ RUN apt-get update -q \
|
|||
|
||||
# Download & Install GitLab
|
||||
RUN TMP_FILE=$(mktemp); \
|
||||
wget -q -O $TMP_FILE https://downloads-packages.s3.amazonaws.com/ubuntu-14.04/gitlab_7.5.1-omnibus.5.2.0.ci-1_amd64.deb \
|
||||
wget -q -O $TMP_FILE https://downloads-packages.s3.amazonaws.com/ubuntu-14.04/gitlab_7.5.2-omnibus.5.2.1.ci-1_amd64.deb \
|
||||
&& dpkg -i $TMP_FILE \
|
||||
&& rm -f $TMP_FILE
|
||||
|
||||
|
@ -29,4 +29,4 @@ VOLUME ["/var/opt/gitlab", "/var/log/gitlab", "/etc/gitlab"]
|
|||
ADD gitlab.rb /etc/gitlab/
|
||||
|
||||
# Default is to run runit & reconfigure
|
||||
CMD gitlab-ctl reconfigure > /var/log/gitlab/reconfigure.log & /opt/gitlab/embedded/bin/runsvdir-start
|
||||
CMD gitlab-ctl reconfigure & /opt/gitlab/embedded/bin/runsvdir-start
|
||||
|
|
|
@ -39,7 +39,7 @@ After creating this run GitLab:
|
|||
sudo docker run --detach --name gitlab_app --publish 8080:80 --publish 2222:22 --volumes-from gitlab_data gitlab_image
|
||||
```
|
||||
|
||||
It might take a while before the docker container is responding to queries.
|
||||
It might take a while before the docker container is responding to queries. You can follow the configuration process with `docker logs -f gitlab`.
|
||||
|
||||
You can then go to `http://localhost:8080/` (or `http://192.168.59.103:8080/` if you use boot2docker).
|
||||
You can login with username `root` and password `5iveL!fe`.
|
||||
|
@ -51,14 +51,18 @@ How to configure GitLab
|
|||
|
||||
This container uses the official Omnibus GitLab distribution, so all configuration is done in the unique configuration file `/etc/gitlab/gitlab.rb`.
|
||||
|
||||
To access GitLab configuration, you can start a new container using the shared data volume container:
|
||||
To access GitLab configuration, you can start an interactive command line in a new container using the shared data volume container, you will be able to browse the 3 directories and use your favorite text editor:
|
||||
|
||||
docker run -ti --rm --volumes-from gitlab_data ubuntu vi /etc/gitlab/gitlab.rb
|
||||
```bash
|
||||
docker run -ti -e TERM=linux --rm --volumes-from gitlab_data ubuntu
|
||||
vi /etc/gitlab/gitlab.rb
|
||||
```
|
||||
|
||||
**Note** that GitLab will reconfigure itself **at each container start.** You will need to restart the container to reconfigure your GitLab.
|
||||
|
||||
You can find all available options in [Omnibus GitLab documentation](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md#configuration).
|
||||
|
||||
|
||||
Troubleshooting
|
||||
=========================
|
||||
Please see the [troubleshooting](troubleshooting.md) file in this directory.
|
||||
|
|
Loading…
Reference in New Issue