From f2076676f2e7183703f92de12b663502ccef88a1 Mon Sep 17 00:00:00 2001 From: yaso Date: Fri, 12 Jun 2026 11:40:15 +0200 Subject: [PATCH 1/4] forgejo git migraton --- docker-compose.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 6f6d3e2b..29d49f13 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,39 +18,39 @@ services: - ./mih_nginx/letsencrypt:/etc/letsencrypt networks: - mih-network - #============== GITEA ==================================================================== - mih-gitea: - image: gitea/gitea:latest-rootless - container_name: mih-gitea + #============== FORGEJO ==================================================================== + mih-forgejo: + image: codeberg.org/forgejo/forgejo:11 + container_name: mih-forgejo environment: - USER_UID=1000 - USER_GID=1000 - TZ=Africa/Johannesburg - - GITEA__database__DB_TYPE=mysql - - GITEA__database__HOST=mih-gitea-db:3306 - - GITEA__database__NAME=${GITEA_SQL_DB} - - GITEA__database__USER=${GITEA_SQL_USER} - - GITEA__database__PASSWD=${GITEA_SQL_PW} + - FORGEJO__database__DB_TYPE=mysql + - FORGEJO__database__HOST=mih-forgejo-db:3306 + - FORGEJO__database__NAME=${FORGEJO_SQL_DB} + - FORGEJO__database__USER=${FORGEJO_SQL_USER} + - FORGEJO__database__PASSWD=${FORGEJO_SQL_PW} restart: always networks: - mih-network volumes: - - ./mih_git/gitea:/data + - ./mih_git/forgejo:/data ports: - "127.0.0.1:3000:3000" - "127.0.0.1:222:22" depends_on: - mih-gitea-db: + mih-forgejo-db: condition: service_healthy - mih-gitea-db: + mih-forgejo-db: image: mysql:8.0 - container_name: mih-gitea-db + container_name: mih-forgejo-db restart: always environment: - - MYSQL_ROOT_PASSWORD=${GITEA_SQL_ROOT_PW} - - MYSQL_USER=${GITEA_SQL_USER} - - MYSQL_PASSWORD=${GITEA_SQL_PW} - - MYSQL_DATABASE=${GITEA_SQL_DB} + - MYSQL_ROOT_PASSWORD=${FORGEJO_SQL_ROOT_PW} + - MYSQL_USER=${FORGEJO_SQL_USER} + - MYSQL_PASSWORD=${FORGEJO_SQL_PW} + - MYSQL_DATABASE=${FORGEJO_SQL_DB} networks: - mih-network volumes: From 8f9f834a2321f2b141cacf56b7508ba07546c51e Mon Sep 17 00:00:00 2001 From: yaso Date: Fri, 12 Jun 2026 12:58:32 +0200 Subject: [PATCH 2/4] mih git ssh config --- mih_git_ssh_config.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 mih_git_ssh_config.md diff --git a/mih_git_ssh_config.md b/mih_git_ssh_config.md new file mode 100644 index 00000000..19320289 --- /dev/null +++ b/mih_git_ssh_config.md @@ -0,0 +1,10 @@ +Add the following to your ~/.ssh/config file + +Host git.mzansi-innovation-hub.co.za + HostName git.mzansi-innovation-hub.co.za + User git + Port 222 + IdentityFile ~/.ssh/id_ed25519 + IdentitiesOnly yes + HostKeyAlgorithms +ssh-rsa + PubkeyAcceptedKeyTypes +ssh-rsa From 25c765e99b4f58f964027ca93b3fe6fc0e249b8c Mon Sep 17 00:00:00 2001 From: yaso Date: Fri, 12 Jun 2026 13:08:24 +0200 Subject: [PATCH 3/4] mih git ssh --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 29d49f13..43b70fb9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -38,7 +38,7 @@ services: - ./mih_git/forgejo:/data ports: - "127.0.0.1:3000:3000" - - "127.0.0.1:222:22" + - "222:22" depends_on: mih-forgejo-db: condition: service_healthy From 1d4882c9e2420b99dbea0bc3a31379e848d56f07 Mon Sep 17 00:00:00 2001 From: yaso Date: Fri, 12 Jun 2026 13:35:38 +0200 Subject: [PATCH 4/4] remove ssh config md --- mih_git_ssh_config.md | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 mih_git_ssh_config.md diff --git a/mih_git_ssh_config.md b/mih_git_ssh_config.md deleted file mode 100644 index 19320289..00000000 --- a/mih_git_ssh_config.md +++ /dev/null @@ -1,10 +0,0 @@ -Add the following to your ~/.ssh/config file - -Host git.mzansi-innovation-hub.co.za - HostName git.mzansi-innovation-hub.co.za - User git - Port 222 - IdentityFile ~/.ssh/id_ed25519 - IdentitiesOnly yes - HostKeyAlgorithms +ssh-rsa - PubkeyAcceptedKeyTypes +ssh-rsa