gitlab starts #10

jessopb · 2022-10-19T03:07:06Z

No description provided.

gitlab/Makefile

gitlab/docker-compose.yaml

EnigmaCurry · 2023-01-26T17:51:52Z

gitlab/.env-dist

+POSTGRES_PASS=password
+POSTGRES_DB_NAME=gitlab_production
+GITLAB_ROOT_PASSWORD=changeme


passwords should be blank in .env-dist, otherwise the Makefile won't randomize it.

gitlab/Makefile

EnigmaCurry · 2023-01-26T17:53:57Z

gitlab/README.md

+
+## Initial setup
+
+Bring up the service with `docker-compose up -d`


Lets use the make style to describe how to bringing up the service.

make config
make install
make open

EnigmaCurry · 2023-01-26T17:54:55Z

gitlab/docker-compose.yaml

+      test:
+        [
+          "CMD-SHELL",
+          "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB_NAME"


is double $$ correct here?

EnigmaCurry · 2023-01-26T17:56:14Z

gitlab/docker-compose.yaml

+      - "traefik.http.routers.gitlab-web.rule=Host(`${GITLAB_TRAEFIK_HOST}`)"
+      - "traefik.http.routers.gitlab-web.entrypoints=websecure"
+      - "traefik.http.routers.gitlab-web.service=gitlab-web"
+      - "traefik.http.routers.gitlab-web.tls.certresolver=${ACME_CERT_RESOLVER}"


certresolvers aren't needed anymore that we are using manual cert creation with make certs

EnigmaCurry · 2023-01-26T17:58:37Z

gitlab/docker-compose.yaml

+      - "traefik.http.services.gitlab-web.loadbalancer.server.port=80"
+      ## SSH
+      - "traefik.tcp.routers.gitlab-ssh.rule=HostSNI(`*`)"
+      - "traefik.tcp.routers.gitlab-ssh.entrypoints=ssh"


ssh is the same entrypoint that gitea uses, its on port 2222. Did you mean to use a different entrypoint on port 2224 (this requires modifying the traefik config)? I don't know why you would need to run both gitea and gitlab on the same machine, so maybe sharing the same entrypoint is the right thing to do.

d.rymcg.tech/traefik/config/traefik.yml

Lines 115 to 118 in 9728d87

#@ if data.values.ssh_entrypoint_enabled == "true":

ssh:

address: #@ data.values.ssh_entrypoint_host + ":" + data.values.ssh_entrypoint_port

#@ end

EnigmaCurry · 2023-01-26T18:00:43Z

gitlab/.env-dist

+POSTGRES_PORT=5432
+POSTGRES_PASS=password
+POSTGRES_DB_NAME=gitlab_production
+GITLAB_ROOT_PASSWORD=changeme


please add a newline

EnigmaCurry

EnigmaCurry · 2023-01-26T19:39:07Z

gitlab/Makefile

@@ -5,5 +5,5 @@ include ../_scripts/Makefile.projects
 config:
 	@${BIN}/reconfigure_ask ${ENV_FILE} GITLAB_TRAEFIK_HOST "Enter your gitlab domain name" "gl.${ROOT_DOMAIN}"
 	@${BIN}/reconfigure_ask ${ENV_FILE} APP_NAME "Enter the service description" "git thing"
-	@${BIN}/reconfigure ${ENV_FILE} POSTGRES_PASS=$(shell openssl rand -hex 45)
-	@${BIN}/reconfigure ${ENV_FILE} GITLAB_ROOT_PASSWORD=$(shell openssl rand -hex 45)
+	@[[ -z "$$(dotenv -f ${ENV_FILE} get POSTGRES_PASS)" ]] && ${BIN}/reconfigure ${ENV_FILE} POSTGRES_PASS=$(shell openssl rand -hex 45) || true


dotenv should be ${BIN}/dotenv

You can now use the reconfigure_password script instead of this.

@${BIN}/reconfigure_password ${ENV_FILE} POSTGRES_PASS

EnigmaCurry · 2023-02-09T21:10:51Z

gitlab/.env-dist

+GITLAB_TRAEFIK_HOST=git.example.com
+GITLAB_SSH_PORT=2224
+# Choose Let's Encrypt 'staging' or 'production' environment:
+ACME_CERT_RESOLVER=production


ACME_CERT_RESOLVER is no longer used

EnigmaCurry · 2023-02-09T21:12:02Z

gitlab/.env-dist

+# Choose Let's Encrypt 'staging' or 'production' environment:
+ACME_CERT_RESOLVER=production
+
+POSTGRES_USER=gitlab


These should all be namespaced like GITLAB_POSTGRES_USER

(In theory, you should be able to concatenate all of the d.rymcg.tech project .env files together into one and not have any overlaps)

EnigmaCurry · 2023-02-09T21:14:05Z

gitlab/docker-compose.yaml

+      - "traefik.http.routers.gitlab-web.entrypoints=websecure"
+      - "traefik.http.routers.gitlab-web.service=gitlab-web"
+      - "traefik.http.routers.gitlab-web.tls.certresolver=${ACME_CERT_RESOLVER}"
+      - "traefik.http.services.gitlab-web.loadbalancer.server.port=80"


server.port is not required as long as the image properly specified an EXPOSE in its Dockerfile, traefik will autodetect the port.

EnigmaCurry · 2023-02-09T21:14:48Z

gitlab/docker-compose.yaml

+      ## Web
+      - "traefik.http.routers.gitlab-web.rule=Host(`${GITLAB_TRAEFIK_HOST}`)"
+      - "traefik.http.routers.gitlab-web.entrypoints=websecure"
+      - "traefik.http.routers.gitlab-web.service=gitlab-web"


specifying the service is not necessary, traefik will autodetect this.

EnigmaCurry · 2023-02-09T21:15:49Z

gitlab/docker-compose.yaml

+        ]
+  gitlab:
+    image: gitlab/gitlab-ce:latest
+    container_name: gitlab


remove the container name to support multiple instances.

EnigmaCurry · 2023-02-09T21:16:34Z

gitlab/docker-compose.yaml

+      GITLAB_OMNIBUS_CONFIG: |
+        gitlab_rails['gitlab_shell_ssh_port'] = ${GITLAB_SSH_PORT}
+    networks:
+      - traefik-proxy


we're not using the traefik-proxy network anymore, no networks need to be configured.

EnigmaCurry reviewed Oct 19, 2022

View reviewed changes

gitlab/Makefile Outdated Show resolved Hide resolved

gitlab/docker-compose.yaml Show resolved Hide resolved

EnigmaCurry force-pushed the master branch 24 times, most recently from 191eefe to d1f0644 Compare October 28, 2022 02:04

jessopb force-pushed the service-gitlab branch 3 times, most recently from 97fd63e to 0904991 Compare January 26, 2023 16:06

gitlab service

e3ff9c1

jessopb force-pushed the service-gitlab branch from 0904991 to e3ff9c1 Compare January 26, 2023 16:16

jessopb force-pushed the service-gitlab branch from 6bdbdcd to e3ff9c1 Compare January 26, 2023 16:20

readme - gitlab ssh port

236403d

jessopb marked this pull request as ready for review January 26, 2023 16:46

update makefile password script

d03b360

EnigmaCurry reviewed Jan 26, 2023

View reviewed changes

EnigmaCurry requested changes Jan 26, 2023

View reviewed changes

EnigmaCurry reviewed Jan 26, 2023

View reviewed changes

EnigmaCurry reviewed Feb 9, 2023

View reviewed changes

EnigmaCurry marked this pull request as draft May 7, 2023 19:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

gitlab starts #10

gitlab starts #10

jessopb commented Oct 19, 2022

EnigmaCurry Jan 26, 2023

EnigmaCurry Jan 26, 2023

EnigmaCurry Jan 26, 2023

EnigmaCurry Jan 26, 2023

EnigmaCurry Jan 26, 2023

EnigmaCurry Jan 26, 2023

EnigmaCurry Jan 26, 2023

EnigmaCurry left a comment

EnigmaCurry Jan 26, 2023

EnigmaCurry Feb 9, 2023 •

edited

Loading

EnigmaCurry Feb 9, 2023 •

edited

Loading

EnigmaCurry Feb 9, 2023

EnigmaCurry Feb 9, 2023

EnigmaCurry Feb 9, 2023

EnigmaCurry Feb 9, 2023

EnigmaCurry Feb 9, 2023


		## Initial setup

		Bring up the service with `docker-compose up -d`

	#@ if data.values.ssh_entrypoint_enabled == "true":
	ssh:
	address: #@ data.values.ssh_entrypoint_host + ":" + data.values.ssh_entrypoint_port
	#@ end

gitlab starts #10

Are you sure you want to change the base?

gitlab starts #10

Conversation

jessopb commented Oct 19, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

EnigmaCurry left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

EnigmaCurry Feb 9, 2023 • edited Loading

Choose a reason for hiding this comment

EnigmaCurry Feb 9, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

EnigmaCurry Feb 9, 2023 •

edited

Loading

EnigmaCurry Feb 9, 2023 •

edited

Loading