summaryrefslogtreecommitdiff
path: root/doc/administration/packages
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-08-08 15:10:32 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-08-08 15:10:32 +0000
commit3de2ce7c6b536d63ea2f93239022eb51fa9241c1 (patch)
treeac66971b2cb57f1b24f1f03879abf9b27398fa10 /doc/administration/packages
parent61cf5b32c5a6a3982a704d33e72ea9b391a3b04d (diff)
downloadgitlab-ce-3de2ce7c6b536d63ea2f93239022eb51fa9241c1.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/packages')
-rw-r--r--doc/administration/packages/container_registry.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/administration/packages/container_registry.md b/doc/administration/packages/container_registry.md
index cc3d3abe2cf..8b115ca1af4 100644
--- a/doc/administration/packages/container_registry.md
+++ b/doc/administration/packages/container_registry.md
@@ -1202,8 +1202,8 @@ Before diving in to the following sections, here's some basic troubleshooting:
been synchronized (for example, via NTP).
1. If you are using an S3-backed Registry, double check that the IAM
- permissions and the S3 credentials (including region) are correct. See [the
- sample IAM policy](https://docs.docker.com/registry/storage-drivers/s3/)
+ permissions and the S3 credentials (including region) are correct. See
+ [the sample IAM policy](https://docs.docker.com/registry/storage-drivers/s3/)
for more details.
1. Check the Registry logs (for example `/var/log/gitlab/registry/current`) and the GitLab production logs
@@ -1631,8 +1631,8 @@ wrong. However, since all communications between Docker clients and servers
are done over HTTPS, it's a bit difficult to decrypt the traffic quickly even
if you know the private key. What can we do instead?
-One way would be to disable HTTPS by setting up an [insecure
-Registry](https://docs.docker.com/registry/insecure/). This could introduce a
+One way would be to disable HTTPS by setting up an
+[insecure Registry](https://docs.docker.com/registry/insecure/). This could introduce a
security hole and is only recommended for local testing. If you have a
production system and can't or don't want to do this, there is another way:
use mitmproxy, which stands for Man-in-the-Middle Proxy.