From ba7035a2bb0491c69dce8e650517c9eb8122d12d Mon Sep 17 00:00:00 2001 From: LinuxSquare Date: Thu, 4 Apr 2024 20:20:32 +0200 Subject: [PATCH] initial commit --- config.json | 11 ++++------- docker-compose.yml | 30 +++++++++++++++--------------- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/config.json b/config.json index 47959e5..ff8a37d 100644 --- a/config.json +++ b/config.json @@ -1,13 +1,10 @@ { "network": { - "name": "noveria" + "name": "gitlabnet" }, "container": { - "name": "forgejo", - "hasEnvVars": true, - "envVars": [ - "FORGEJO__database__USER", - "FORGEJO__database__PASSWD" - ] + "name": "gitlab", + "hasEnvVars": false, + "envVars": [] } } diff --git a/docker-compose.yml b/docker-compose.yml index 750d5c0..7492fa5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,23 +1,23 @@ version: '3' services: - forgejo_server: - image: codeberg.org/forgejo/forgejo:1.21-rootless - container_name: forgejo - environment: - USER_UID: 1000 - USER_GID: 1000 - FORGEJO__database__DB_TYPE: mysql - FORGEJO__database__HOST: noveria_db:3306 - FORGEJO__database__NAME: forgejo - FORGEJO__database__USER: - FORGEJO__database__PASSWD: + gitlab_server: + image: docker.io/gitlab/gitlab-ce:latest + container_name: gitlab_server restart: always volumes: - - ./data:/data - - /etc/localtime:/etc/localtime:ro + - ./data:/var/opt/gitlab + - ./logs:/var/log/gitlab + - ./config:/etc/gitlab + + gitlab_runner: + image: docker.io/gitlab/gitlab-runner:latest + container_name: gitlab-runner + restart: always + volumes: + - ./runner/config:/etc/gitlab-runner + - /var/run/podman/podman.sock:/var/run/docker.sock networks: default: - external: true - name: noveria + name: gitlabnet