Skip to content
Snippets Groups Projects

Bundle registry

Merged Bundle registry
bundle_registry into master
Merged Marin Jankovski requested to merge bundle_registry into master

Fixes #1218 (closed)

Depends on gitlab-org/gitlab-ce!3787

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Marin Jankovski Added 1 commit:

    Added 1 commit:

    • 1bd7c93d - Remove the check for enabled nginx, in theory it now shouldn't matter if bundled…
  • Marin Jankovski Added 2 commits:

    Added 2 commits:

    • f8577330 - Add registry configuration to gitlab.rb.template.
    • 4833cb2b - Restart registry on version change.
  • Marin Jankovski
    Marin Jankovski @marin ·
    Author Maintainer

    This MR misses documentation.

    @axil Will we have a separate documentation for Container Registry usage and for configuration? Shall I start writing the configuration part and place it in the omnibus-gitlab repository? I don't know if we have a decision on how to split feature from configuration.

  • Achilleas Pipinellis
    Achilleas Pipinellis @axil ·
    Maintainer

    @marin thanks for asking!

    TL;DR In your case, create a new doc in CE under doc/administration/docker_registry.md, place your Omnibus stuff and we can work later for source installations (or if you can do both that's fine by all means).

    This has been discussed before and should be documented in the guidelines, my fault it's not there already. Anyway, the thing is:

    • if the documentation affects both source and Omnibus, then it should go under CE/EE docs. For example, Git LFS and GitLab Pages are both in CE and EE docs respectively. Then you can reference it in Omnibus README like we do with Pages http://doc.gitlab.com/omnibus/#configuring
    • if it concerns only the Omnibus documentation, like maintenance or changing the external_url it should go to Omnibus.

    Another thing is that we should add admin stuff under doc/administration/, user stuff under some other dir and then cross link them. There is a big discussion about this in https://gitlab.com/gitlab-org/gitlab-ce/issues/3349. LFS and Pages are bad examples since we host both admin and user docs in the same dir :/

    PS. Thinking ahead, another option is to create a separate dir doc/administration/docker_registry/ and put there any Docker registry related stuff. That is if you think we will need to split things later. This is the case with doc/administration/high_availability/ or doc/monitoring/performance/. Fun stuff...

  • Achilleas Pipinellis
  • Achilleas Pipinellis
  • Kamil Trzcińśki
  • Kamil Trzcińśki
  • Kamil Trzcińśki
    Kamil Trzcińśki @ayufan started a thread on the diff
    • files/gitlab-config-template/gitlab.rb.template
    309 309 # gitlab_rails['smtp_ca_path'] = "/etc/ssl/certs"
    310 310 # gitlab_rails['smtp_ca_file'] = "/etc/ssl/certs/ca-certificates.crt"
    311 311
    312 ###############################
    313 # Container registry settings #
    314 ###############################
    315 # see LINK
    316 #
    317
    318 # Settings used by GitLab application
    319 # gitlab_rails['registry_enabled'] = true
    320 # gitlab_rails['registry_host'] = "registry.gitlab.example.com"
    • Kamil Trzcińśki
      Kamil Trzcińśki @ayufan ·
      Maintainer

      I did improve this configuration, to:

        registry:
    enabled: true
    host: registry.ngrok.ayufan.eu:custom-port
    api_url: http://localhost:5000
    key: config/registry.key
    issuer: omnibus-certificate
  • Kamil Trzcińśki
  • Kamil Trzcińśki
  • Kamil Trzcińśki
  • Kamil Trzcińśki
    Kamil Trzcińśki @ayufan ·
    Maintainer

    @marin LGTM. Only small improvements to align this with latest changes :)

  • Marin Jankovski Added 38 commits:

    Added 38 commits:

    • 4833cb2b...317e7ab5 - 22 commits from branch master
    • 2b01bcde - Add some postgres configuration variables
    • 368d1897 - Add postgres variables to gitlab.rb.template
    • 5675dcdb - Merge branch 'add-postgres-configs' into 'master'
    • f97d0893 - Add registry.
    • 63f99748 - Append registry user to web server group. Create a registry directory at the exp…
    • 46494e45 - For now, lets use external_url as realm.
    • a319f294 - Fix a typo and rename the services.
    • 219b1de7 - Add registry issuer option.
    • e8374bf6 - Minor changes to the configuration.
    • 83cf7bcc - Attribute fixes.
    • 7804ae3d - Append the registry user to the web server group so it is not altered on every reconfigure.
    • 542de609 - Remove the check for enabled nginx, in theory it now shouldn't matter if bundled…
    • 0fd30050 - Add registry configuration to gitlab.rb.template.
    • c6600ffc - Restart registry on version change.
    • 09322516 - Fix spelling and typos.
    • cf1294a8 - Change the obsolete gitlab.yml settings.
    Toggle commit list
  • Marin Jankovski Added 4 commits:

    Added 4 commits:

    Toggle commit list
  • Marin Jankovski Added 1 commit:

    Added 1 commit:

  • Marin Jankovski Unmarked this merge request as a Work In Progress

    Unmarked this merge request as a Work In Progress

  • Marin Jankovski Added 1 commit:

    Added 1 commit:

    • 39fa688f - Revert "Build from branch."
  • Marin Jankovski mentioned in commit f74472d4

    mentioned in commit f74472d4

  • Marin Jankovski Status changed to merged

    Status changed to merged

  • Marin Jankovski mentioned in commit db9dc57b

    mentioned in commit db9dc57b

  • Marin Jankovski mentioned in commit 31bfd0e1

    mentioned in commit 31bfd0e1

  • Achilleas Pipinellis Mentioned in commit pfjason/gitlab-ce@669fc3b9

    Mentioned in commit pfjason/gitlab-ce@669fc3b9

  • Achilleas Pipinellis Mentioned in commit pfjason/gitlab-ce@399d5e72

    Mentioned in commit pfjason/gitlab-ce@399d5e72

  • Achilleas Pipinellis mentioned in commit test-nick/gitlab-ce@8e1dce1e

    mentioned in commit test-nick/gitlab-ce@8e1dce1e

  • Achilleas Pipinellis mentioned in commit test-nick/gitlab-ce@6f48ddd0

    mentioned in commit test-nick/gitlab-ce@6f48ddd0

    • Please register or sign in to reply