Skip to content
Snippets Groups Projects
Commit 88d07fb4 authored by Marin Jankovski's avatar Marin Jankovski
Browse files

Merge branch 'fix-gitlab-ctl-down-in-docker' into 'master'

Add a missing symlink for /opt/gitlab/init/sshd to make `gitlab-ctl stop` work in Docker

Closes gitlab-ee#2406

See merge request !1556
parents fd2d8f79 f43daa0f
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -5,6 +5,7 @@ omnibus-gitlab repository.
 
9.2.0
 
- Add a missing symlink for /opt/gitlab/init/sshd to make `gitlab-ctl stop` work in Docker 4a098168
- Allow setting `usage_ping_enabled` in `gitlab.rb`
- Update mysql client to 5.5.55
- Add a build env variable ALTERNATIVE_SOURCES f0cab0c6
Loading
Loading
Loading
Loading
@@ -72,6 +72,7 @@ fi
echo "Preparing services..."
rm -f /opt/gitlab/service/*
ln -s /opt/gitlab/sv/sshd /opt/gitlab/service
ln -s /opt/gitlab/embedded/bin/sv /opt/gitlab/init/sshd
mkdir -p /var/log/gitlab/sshd
 
# Start service manager
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment