Skip to content
This repository was archived by the owner on Oct 25, 2019. It is now read-only.

Commit 2129bf0

Browse files
genezysgenezys
committed
Upgrade to 7.8.4
1 parent 28e1820 commit 2129bf0

File tree

4 files changed

+23
-8
lines changed

4 files changed

+23
-8
lines changed

‎Dockerfile‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Build: docker build -t genezys/gitlab:7.8.1 .
1+
# Build: docker build -t genezys/gitlab:7.8.4 .
22
# Data: docker run --name gitlab_data --volume /var/opt/gitlab --volume /var/log/gitlab --volume /etc/gitlab ubuntu:14.04 /bin/true
3-
# Run: docker run --detach --name gitlab_app --publish 8080:80 --publish 2222:22 --volumes-from gitlab_data genezys/gitlab:7.8.1
3+
# Run: docker run --detach --name gitlab_app --publish 8080:80 --publish 2222:22 --volumes-from gitlab_data genezys/gitlab:7.8.4
44

55
FROM ubuntu:14.04
66
MAINTAINER Vincent Robert <vincent.robert@genezys.net>
@@ -16,7 +16,7 @@ RUN apt-get update -q \
1616
# If the Omnibus package version below is outdated please contribute a merge request to update it.
1717
# If you run GitLab Enterprise Edition point it to a location where you have downloaded it.
1818
RUN TMP_FILE=$(mktemp); \
19-
wget -q -O $TMP_FILE https://downloads-packages.s3.amazonaws.com/ubuntu-14.04/gitlab_7.8.1-omnibus-1_amd64.deb \
19+
wget -q -O $TMP_FILE https://downloads-packages.s3.amazonaws.com/ubuntu-14.04/gitlab_7.8.4-omnibus-1_amd64.deb \
2020
&& dpkg -i $TMP_FILE \
2121
&& rm -f $TMP_FILE
2222

@@ -28,12 +28,16 @@ RUN mkdir -p /opt/gitlab/sv/sshd/supervise \
2828
&& ln -s /opt/gitlab/sv/sshd /opt/gitlab/service \
2929
&& mkdir -p /var/run/sshd
3030

31+
# Add bootstrap script
32+
ADD gitlab.rb /opt/gitlab/etc/gitlab.rb.template
33+
ADD gitlab.sh /usr/local/bin/gitlab.sh
34+
RUN chmod +x /usr/local/bin/gitlab.sh
35+
3136
# Expose web & ssh
3237
EXPOSE 80 22
3338

3439
# Volume & configuration
3540
VOLUME ["/var/opt/gitlab", "/var/log/gitlab", "/etc/gitlab"]
36-
ADD gitlab.rb /etc/gitlab/
3741

3842
# Default is to run runit & reconfigure
39-
CMD gitlab-ctl reconfigure & /opt/gitlab/embedded/bin/runsvdir-start
43+
CMD ["/usr/local/bin/gitlab.sh"]

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ sudo docker run --name gitlab_data --volume /var/opt/gitlab --volume /var/log/gi
3232
After creating this, run GitLab:
3333

3434
```bash
35-
sudo docker run --detach --name gitlab_app --publish 8080:80 --publish 2222:22 --volumes-from gitlab_data genezys/gitlab:7.8.1
35+
sudo docker run --detach --name gitlab_app --publish 8080:80 --publish 2222:22 --volumes-from gitlab_data genezys/gitlab:7.8.4
3636
```
3737

3838
It might take a while before the docker container is responding to queries. You can follow the configuration process with `docker logs -f gitlab_app`.

‎crane.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ containers:
99
- "/etc/gitlab"
1010

1111
gitlab_app:
12-
image: genezys/gitlab:7.8.1
12+
image: genezys/gitlab:7.8.4
1313
dockerfile: .
1414
run:
1515
detach: true
@@ -20,7 +20,7 @@ containers:
2020
- gitlab_data
2121

2222
gitlab_debug:
23-
image: genezys/gitlab:7.8.1
23+
image: genezys/gitlab:7.8.4
2424
run:
2525
rm: true
2626
tty: true

‎gitlab.sh‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/sh
2+
3+
# Copy the template gitlab.rb to the configuration volume
4+
if [ ! -f /etc/gitlab/gitlab.rb ]
5+
then
6+
cp /opt/gitlab/etc/gitlab.rb.template /etc/gitlab/gitlab.rb
7+
fi
8+
9+
# Run reconfigure in the background while we start the services
10+
gitlab-ctl reconfigure &
11+
/opt/gitlab/embedded/bin/runsvdir-start

0 commit comments

Comments
 (0)