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
iv
gitlab-ce
Commits
e62b5797
Commit
e62b5797
authored
Jul 14, 2015
by
Kamil Trzciński
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'docker-image' into 'master'
Fix docker image See merge request !979
parents
997a3b1d
753f34c8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
docker/Dockerfile
docker/Dockerfile
+3
-1
docker/assets/wrapper
docker/assets/wrapper
+5
-0
No files found.
docker/Dockerfile
View file @
e62b5797
...
@@ -30,7 +30,9 @@ RUN ( \
...
@@ -30,7 +30,9 @@ RUN ( \
echo
""
&&
\
echo
""
&&
\
echo
"# Docker options"
&&
\
echo
"# Docker options"
&&
\
echo
"# Prevent Postgres from trying to allocate 25% of total memory"
&&
\
echo
"# Prevent Postgres from trying to allocate 25% of total memory"
&&
\
echo
"postgresql['shared_buffers'] = '1MB'"
)
>>
/etc/gitlab/gitlab.rb
echo
"postgresql['shared_buffers'] = '1MB'"
)
>>
/etc/gitlab/gitlab.rb
&&
\
mkdir
-p
/assets/
&&
\
cp
/etc/gitlab/gitlab.rb /assets/gitlab.rb
# Expose web & ssh
# Expose web & ssh
EXPOSE
443 80 22
EXPOSE
443 80 22
...
...
docker/assets/wrapper
View file @
e62b5797
...
@@ -13,4 +13,9 @@ function entrypoint() {
...
@@ -13,4 +13,9 @@ function entrypoint() {
gitlab-ctl
tail
# tail all logs
gitlab-ctl
tail
# tail all logs
}
}
if
[[
!
-e
/etc/gitlab/gitlab.rb
]]
;
then
cp
/assets/gitlab.rb /etc/gitlab/gitlab.rb
chmod
0600 /etc/gitlab/gitlab.rb
fi
entrypoint
entrypoint
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