Skip to content

Commit bedd98c

Browse files
updates template compose and toml to use internal port mapping
1 parent 8b7cd62 commit bedd98c

2 files changed

Lines changed: 19 additions & 6 deletions

File tree

blueprints/forgejo/docker-compose.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@ services:
1212
- FORGEJO__database__USER=forgejo
1313
- FORGEJO__database__PASSWD=forgejo
1414
- FORGEJO__server__DOMAIN=${FORGEJO_DOMAIN}
15-
- FORGEJO__server__SSH_DOMAIN=${FORGEJO_DOMAIN}
15+
- FORGEJO__server__SSH_DOMAIN=${FORGEJO_SSH_DOMAIN}
1616
- FORGEJO__server__ROOT_URL=https://${FORGEJO_DOMAIN}/
17-
- FORGEJO__server__SSH_PORT=2222
17+
- FORGEJO__server__SSH_PORT=
1818
- FORGEJO__server__SSH_LISTEN_PORT=22
1919
restart: always
2020
ports:
21-
## Avoids conflicting with host ssh server.
22-
## Make sure port 2222 is open to connections on host machine.
23-
- "2222:22"
21+
- 3000
22+
- 22
2423
volumes:
2524
- forgejo_server:/data
2625
- /etc/timezone:/etc/timezone:ro

blueprints/forgejo/template.toml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,25 @@
11
[variables]
22
main_domain = "${domain}"
3+
ssh_domain = "${domain}"
34

45
[config]
5-
env = ["USER_UID=1000", "USER_GID=1000", "FORGEJO_DOMAIN=${main_domain}"]
6+
env = [
7+
"USER_UID=1000",
8+
"USER_GID=1000",
9+
"FORGEJO_DOMAIN=${main_domain}",
10+
"FORGEJO_SSH_DOMAIN=${ssh_domain}",
11+
"",
12+
"## SET THE API URL IN CONSOLE CONFIG BY CLICKING THE COG",
13+
"## FORGEJO_SSH_DOMAIN: ${ssh_domain}"
14+
]
615
mounts = []
716

817
[[config.domains]]
918
serviceName = "forgejo"
1019
port = 3_000
1120
host = "${main_domain}"
21+
22+
[[config.domains]]
23+
serviceName = "forgejo"
24+
port = 22
25+
host = "${ssh_domain}"

0 commit comments

Comments
 (0)