From 4a098168b608b7195257c00cc1059beb89626a78 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Mon, 15 May 2017 16:40:58 -0700
Subject: [PATCH 1/2] Add a missing symlink for /opt/gitlab/init/sshd to make
 `gitlab-ctl stop` work in Docker

Closes gitlab-ee#2406
---
 docker/assets/wrapper | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/assets/wrapper b/docker/assets/wrapper
index a1c5cbf836..311b3a111c 100755
--- a/docker/assets/wrapper
+++ b/docker/assets/wrapper
@@ -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
-- 
GitLab


From f43daa0f1b01b0845698482b963fa96bfd5944cd Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Mon, 15 May 2017 16:41:23 -0700
Subject: [PATCH 2/2] Add CHANGELOG.md for Docker sshd fix

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c222610177..fb9ac2c5c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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
-- 
GitLab