Skip to content
Snippets Groups Projects

[WIP] First try to support both CE and EE in gdk

Closed Achilleas Pipinellis requested to merge ee_support into master

I tested it on a fresh installation.

  • CE and EE are stored in the ce and ee subdirs respectively, each having its own repositories, gitlab-shell and authorized_keys
  • One postgres and redis instance
  • I removed some references to gitlab-runner as it was using the deprecated one.

Caveats

  • currently it is duplicated code :/ but works
  • gitlab-workhorse in the Procfile uses ce/gitlab/public as the document root dir, which seems to work with EE as well

Tree structure

.
├── Gemfile
├── Gemfile.lock
├── LICENSE
├── Makefile
├── Procfile
├── Procfile.example
├── README.md
├── Vagrantfile
├── ce
│   ├── gitlab
│   ├── gitlab-shell
│   └── repositories
├── database.yml.example
├── docker
│   ├── Dockerfile
│   ├── README.md
│   └── assets
├── ee
│   ├── gitlab
│   ├── gitlab-shell
│   └── repositories
├── gitlab-openldap
│   ├── Makefile
│   ├── README.md
│   ├── bin
│   ├── bootstrap.ldif
│   ├── etc
│   ├── frontend.alt.example.com.ldif
│   ├── frontend.example.com.ldif
│   ├── include
│   ├── lib
│   ├── libexec
│   ├── openldap-2.4.40
│   ├── openldap-2.4.40.tgz
│   ├── run-slapd
│   ├── run-slapd-alt
│   ├── sbin
│   ├── share
│   ├── slapd.d
│   └── var
├── gitlab-workhorse
│   ├── CHANGELOG
│   ├── LICENSE
│   ├── Makefile
│   ├── README.md
│   ├── VERSION
│   ├── archive.go
│   ├── artifacts.go
│   ├── authorization.go
│   ├── authorization_test.go
│   ├── deploy_page.go
│   ├── deploy_page_test.go
│   ├── development.go
│   ├── development_test.go
│   ├── error_pages.go
│   ├── error_pages_test.go
│   ├── git-http.go
│   ├── gitlab-workhorse
│   ├── handlers.go
│   ├── handlers_test.go
│   ├── helpers.go
│   ├── helpers_test.go
│   ├── lfs.go
│   ├── logging.go
│   ├── main.go
│   ├── main_test.go
│   ├── proxy.go
│   ├── proxy_test.go
│   ├── sendfile.go
│   ├── sendfile_test.go
│   ├── servefile.go
│   ├── servefile_test.go
│   ├── support
│   ├── test
│   ├── uploads.go
│   ├── uploads_test.go
│   └── upstream.go
├── gitlab.socket
├── postgresql
│   └── data
├── redis
│   ├── redis.conf
│   ├── redis.conf.example
│   ├── redis.socket
│   └── resque.yml.example
└── support
    └── edit-gitlab.yml

28 directories, 59 files

cc @jacobvosmaer @sytses @dzaporozhets

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
97 155
98 156 # Set up supporting services
99 157
100 support-setup: Procfile redis postgresql .bundle
158 support-setup: Procfile Procfile_ee redis postgresql .bundle
101 159 @echo ""
102 160 @echo "*********************************************"
103 161 @echo "************** Setup finished! **************"
104 162 @echo "*********************************************"
105 sed -n '/^## Post-installation/,/^END Post-installation/p' README.md
163 @sed -n '/^## Post-installation/,/^END Post-installation/p' README.md
  • Added 1 commit:

    • 80a457cd - First try to support both CE and EE in gdk
  • Added 2 commits:

    • e107859e - Remove repositories directory
    • 8ad12d38 - Support updating using make for both CE and EE
  • Author Maintainer

    @jacobvosmaer thoughts?

  • mentioned in issue #40 (closed)

  • @axil let's discuss in #40 (closed) first.

  • Added 1 commit:

    • b55ad23c - Fix typos on GitLab EE update documentation
  • Since !117 (merged) we have a recommended procedure to have EE and CE GDK's side by side. Closing this.

    https://gitlab.com/gitlab-org/gitlab-development-kit/blob/master/README.md#gitlab-enterprise-edition

  • username-removed-5302 Status changed to closed

    Status changed to closed

  • Please register or sign in to reply
    Loading