Adding registry enablement fixes

Author: Shocktrooper

.gitignore

@@ -30,3 +30,5 @@ website/build
 website/node_modules
 website/vendor
 /tmp
+certs/gitlab-registry.crt
+certs/gitlab-registry.key

GNUmakefile

@@ -65,16 +65,20 @@ SERVICE ?= gitlab-ce
 GITLAB_TOKEN ?= ACCTEST1234567890123
 GITLAB_BASE_URL ?= http://127.0.0.1:8080/api/v4
 
-testacc-up: ## Launch a GitLab instance.
+testacc-up: | certs ## Launch a GitLab instance.
 	docker-compose up -d $(SERVICE)
 	./scripts/await-healthy.sh
 
 testacc-down: ## Teardown a GitLab instance.
-	docker-compose down
+	docker-compose down --volumes
 
 testacc: ## Run acceptance tests against a GitLab instance.
 	TF_ACC=1 GITLAB_TOKEN=$(GITLAB_TOKEN) GITLAB_BASE_URL=$(GITLAB_BASE_URL) go test -v $(PROVIDER_SRC_DIR) $(TESTARGS) -timeout 40m
 
+certs: ## Generate certs for the GitLab container registry
+	mkdir -p certs
+	openssl req -x509 -newkey rsa:4096 -sha256 -days 3650 -nodes -keyout certs/gitlab-registry.key -out certs/gitlab-registry.crt -subj "/CN=gitlab-registry.com" -addext "subjectAltName=DNS:IP:127.0.0.1"
+
 # TOOLS
 # Tool dependencies are installed into a project-local /bin folder.
 

docker-compose.yml

@@ -17,6 +17,8 @@ services:
       - logs-ce:/var/log/gitlab
       - data-ce:/var/opt/gitlab
       - ${PWD}/scripts/healthcheck-and-setup.sh:/healthcheck-and-setup.sh:Z
+      - ${PWD}/scripts/gitlab.rb:/etc/gitlab/gitlab.rb:ro
+      - ${PWD}/certs:/etc/gitlab/ssl:ro
     healthcheck:
       test: /healthcheck-and-setup.sh
       interval: 10s
@@ -38,6 +40,8 @@ services:
       - data-ee:/var/opt/gitlab
       - ${PWD}/scripts/healthcheck-and-setup.sh:/healthcheck-and-setup.sh:Z
       - ${PWD}/Gitlab-license.txt:/Gitlab-license.txt:Z
+      - ${PWD}/scripts/gitlab.rb:/etc/gitlab/gitlab.rb:ro
+      - ${PWD}/certs:/etc/gitlab/ssl:ro
     healthcheck:
       test: /healthcheck-and-setup.sh
       interval: 10s

scripts/gitlab.rb

@@ -0,0 +1,4 @@
+registry_external_url 'http://127.0.0.1:5050'
+registry['enable']                    = true
+registry_nginx['ssl_certificate']     = "/etc/gitlab/ssl/gitlab-registry.pem"
+registry_nginx['ssl_certificate_key'] = "/etc/gitlab/ssl/gitlab-registry.key"

scripts/healthcheck-and-setup.sh

@@ -28,11 +28,6 @@ test -f $done || {
     printf 'terraform_token.save!;'
   ) | gitlab-rails console
 
-  echo "Enabling the container registry for the instance so that Personal Access Tokens can be created with the read_registry and write_registry scopes"
-  (
-    printf 'Gitlab.config.registry["enabled"] = true'
-  ) | gitlab-rails console
-
   # 2020-09-07: Currently Gitlab (version 13.3.6 ) doesn't allow in admin API
   # ability to set a group as instance level templates.
   # To test resource_gitlab_project_test template features we add