From 71851ddfa6857ec620fb5f9951682c075c0285f6 Mon Sep 17 00:00:00 2001 From: faulty Date: Sat, 10 Dec 2022 22:08:34 +0100 Subject: [PATCH 1/6] tryout --- docker-compose.devops.yml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/docker-compose.devops.yml b/docker-compose.devops.yml index 7777e97..b14e8ce 100644 --- a/docker-compose.devops.yml +++ b/docker-compose.devops.yml @@ -21,4 +21,25 @@ services: - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro ports: - - "22:22" \ No newline at end of file + - "22:22" + + gitlab: + image: gitlab/gitlab-ce:latest + restart: always + hostname: 'lab.neo.faulty.nl' + environment: + GITLAB_OMNIBUS_CONFIG: | + external_url 'https://lab.neo.faulty.nl' + gitlab_rails['gitlab_shell_ssh_port'] = 2222 + # temp ssh port + VIRTUAL_HOST: lab.neo.faulty.nl + LETSENCRYPT_HOST: lab.neo.faulty.nl + ports: + - '2222:22' + volumes: + - /srv/gitlab/config:/etc/gitlab + - /srv/gitlab/data:/var/opt/gitlab + - /srv/gitlab/other/logs:/var/log/gitlab + shm_size: '256m' + networks: + - proxy \ No newline at end of file From 8c41f2efa941dfa1e622bf06afd89c4328bc811a Mon Sep 17 00:00:00 2001 From: faulty Date: Sat, 10 Dec 2022 22:20:54 +0100 Subject: [PATCH 2/6] no https --- docker-compose.devops.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.devops.yml b/docker-compose.devops.yml index b14e8ce..74aca93 100644 --- a/docker-compose.devops.yml +++ b/docker-compose.devops.yml @@ -31,6 +31,7 @@ services: GITLAB_OMNIBUS_CONFIG: | external_url 'https://lab.neo.faulty.nl' gitlab_rails['gitlab_shell_ssh_port'] = 2222 + nginx['listen_https'] = false # temp ssh port VIRTUAL_HOST: lab.neo.faulty.nl LETSENCRYPT_HOST: lab.neo.faulty.nl From 3a678e946ecdc2fbefbd50671b85211078718782 Mon Sep 17 00:00:00 2001 From: faulty Date: Sat, 10 Dec 2022 22:26:23 +0100 Subject: [PATCH 3/6] fix nginx? --- docker-compose.devops.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.devops.yml b/docker-compose.devops.yml index 74aca93..47d18ec 100644 --- a/docker-compose.devops.yml +++ b/docker-compose.devops.yml @@ -31,6 +31,7 @@ services: GITLAB_OMNIBUS_CONFIG: | external_url 'https://lab.neo.faulty.nl' gitlab_rails['gitlab_shell_ssh_port'] = 2222 + nginx['listen_port'] = 80 nginx['listen_https'] = false # temp ssh port VIRTUAL_HOST: lab.neo.faulty.nl From df25697229544a003b95ff128970e3562fc94370 Mon Sep 17 00:00:00 2001 From: faulty Date: Sat, 10 Dec 2022 22:44:20 +0100 Subject: [PATCH 4/6] migrate --- docker-compose.devops.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docker-compose.devops.yml b/docker-compose.devops.yml index 47d18ec..844d4a9 100644 --- a/docker-compose.devops.yml +++ b/docker-compose.devops.yml @@ -8,8 +8,8 @@ services: - USER_UID=1000 - USER_GID=1002 - LETSENCRYPT_EMAIL=webmaster@faulty.nl - - LETSENCRYPT_HOST=git.faulty.nl - - VIRTUAL_HOST=git.faulty.nl + - LETSENCRYPT_HOST=gitea.faulty.nl + - VIRTUAL_HOST=gitea.faulty.nl - VIRTUAL_PORT=3000 restart: always networks: @@ -21,23 +21,23 @@ services: - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro ports: - - "22:22" + - "2222:22" gitlab: image: gitlab/gitlab-ce:latest restart: always - hostname: 'lab.neo.faulty.nl' + hostname: 'git.faulty.nl' environment: GITLAB_OMNIBUS_CONFIG: | - external_url 'https://lab.neo.faulty.nl' - gitlab_rails['gitlab_shell_ssh_port'] = 2222 + external_url 'https://git.faulty.nl' + gitlab_rails['gitlab_shell_ssh_port'] = 22 nginx['listen_port'] = 80 nginx['listen_https'] = false # temp ssh port - VIRTUAL_HOST: lab.neo.faulty.nl - LETSENCRYPT_HOST: lab.neo.faulty.nl + VIRTUAL_HOST: git.faulty.nl + LETSENCRYPT_HOST: git.faulty.nl ports: - - '2222:22' + - '22:22' volumes: - /srv/gitlab/config:/etc/gitlab - /srv/gitlab/data:/var/opt/gitlab From 9f60e2d5cb69d32cbc4b0553f068ff02a2f748ad Mon Sep 17 00:00:00 2001 From: faulty Date: Sun, 11 Dec 2022 14:21:20 +0100 Subject: [PATCH 5/6] gitlab runner --- docker-compose.devops.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docker-compose.devops.yml b/docker-compose.devops.yml index 844d4a9..ec207e3 100644 --- a/docker-compose.devops.yml +++ b/docker-compose.devops.yml @@ -44,4 +44,10 @@ services: - /srv/gitlab/other/logs:/var/log/gitlab shm_size: '256m' networks: - - proxy \ No newline at end of file + - proxy + + gitlab-runner: + image: gitlab/gitlab-runner:latest + volumes: + - /srv/gitlab/other/runner:/etc/gitlab-runner + - /var/run/docker.sock:/var/run/docker.sock From a7d371aa67b1798a3a76096d07de62606196421c Mon Sep 17 00:00:00 2001 From: faulty Date: Mon, 12 Dec 2022 08:37:52 +0100 Subject: [PATCH 6/6] rust url fix? --- docker-compose.games.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.games.yml b/docker-compose.games.yml index c8358b0..98c99d7 100644 --- a/docker-compose.games.yml +++ b/docker-compose.games.yml @@ -33,7 +33,7 @@ services: - RUST_SERVER_MAXPLAYERS=20 - RUST_SERVER_WORLDSIZE=2500 - RUST_SERVER_SEED=694201 - - RUST_SERVER_URL=faulty.nl + - RUST_SERVER_URL=rust.neo.faulty.nl - RUST_SERVER_PORT=28115 - RUST_APP_PORT=28182 - RUST_RCON_PORT=28116