Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
cfe6013b
Commit
cfe6013b
authored
May 13, 2015
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use apt repositories to upgrade Docker builds to the latest GitLab version
Reduces the need to bump versions periodically.
parent
cc0a4b7e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
15 deletions
+12
-15
docker/app/Dockerfile
docker/app/Dockerfile
+5
-6
docker/single/Dockerfile
docker/single/Dockerfile
+7
-9
No files found.
docker/app/Dockerfile
View file @
cfe6013b
...
@@ -5,15 +5,14 @@ RUN apt-get update -q \
...
@@ -5,15 +5,14 @@ RUN apt-get update -q \
&&
DEBIAN_FRONTEND
=
noninteractive apt-get
install
-qy
--no-install-recommends
\
&&
DEBIAN_FRONTEND
=
noninteractive apt-get
install
-qy
--no-install-recommends
\
ca-certificates
\
ca-certificates
\
openssh-server
\
openssh-server
\
wget
wget
\
apt-transport-https
# Download & Install GitLab
# Download & Install GitLab
# If the Omnibus package version below is outdated please contribute a merge request to update it.
# If you run GitLab Enterprise Edition point it to a location where you have downloaded it.
# If you run GitLab Enterprise Edition point it to a location where you have downloaded it.
RUN
TMP_FILE
=
$(
mktemp
)
;
\
RUN
echo
"deb https://packages.gitlab.com/gitlab/gitlab-ce/ubuntu/
`
lsb_release
-cs
`
main"
>
/etc/apt/sources.list.d/gitlab_gitlab-ce.list
wget
-q
-O
$TMP_FILE
https://downloads-packages.s3.amazonaws.com/ubuntu-14.04/gitlab-ce_7.10.1~omnibus.2-1_amd64.deb
\
RUN
wget
-q
-O
- https://packages.gitlab.com/gpg.key | apt-key add -
&&
dpkg
-i
$TMP_FILE
\
RUN
apt-get update
&&
apt-get
install
-yq
--no-install-recommends
gitlab-ce
&&
rm
-f
$TMP_FILE
# Manage SSHD through runit
# Manage SSHD through runit
RUN
mkdir
-p
/opt/gitlab/sv/sshd/supervise
\
RUN
mkdir
-p
/opt/gitlab/sv/sshd/supervise
\
...
...
docker/single/Dockerfile
View file @
cfe6013b
...
@@ -2,20 +2,18 @@ FROM ubuntu:14.04
...
@@ -2,20 +2,18 @@ FROM ubuntu:14.04
MAINTAINER
Sytse Sijbrandij
MAINTAINER
Sytse Sijbrandij
# Install required packages
# Install required packages
RUN
apt-get update
RUN
apt-get update
-q
\
ENV
DEBIAN_FRONTEND noninteractive
&&
DEBIAN_FRONTEND
=
noninteractive apt-get
install
-yq
--no-install-recommends
\
RUN
apt-get
install
-yq
--no-install-recommends
\
ca-certificates
\
ca-certificates
\
openssh-server
\
openssh-server
\
wget
wget
\
apt-transport-https
# Download & Install GitLab
# Download & Install GitLab
# If the Omnibus package version below is outdated please contribute a merge request to update it.
# If you run GitLab Enterprise Edition point it to a location where you have downloaded it.
# If you run GitLab Enterprise Edition point it to a location where you have downloaded it.
RUN
TMP_FILE
=
$(
mktemp
)
;
\
RUN
echo
"deb https://packages.gitlab.com/gitlab/gitlab-ce/ubuntu/
`
lsb_release
-cs
`
main"
>
/etc/apt/sources.list.d/gitlab_gitlab-ce.list
wget
-q
-O
$TMP_FILE
https://downloads-packages.s3.amazonaws.com/ubuntu-14.04/gitlab-ce_7.10.1~omnibus.2-1_amd64.deb
\
RUN
wget
-q
-O
- https://packages.gitlab.com/gpg.key | apt-key add -
&&
dpkg
-i
$TMP_FILE
\
RUN
apt-get update
&&
apt-get
install
-yq
--no-install-recommends
gitlab-ce
&&
rm
-f
$TMP_FILE
# Manage SSHD through runit
# Manage SSHD through runit
RUN
mkdir
-p
/opt/gitlab/sv/sshd/supervise
\
RUN
mkdir
-p
/opt/gitlab/sv/sshd/supervise
\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment