Fixed git setup

This commit is contained in:
Atridad Lahiji 2024-10-19 16:59:01 -06:00
parent d4a324bfb0
commit e78ee00866
Signed by: atridad
SSH key fingerprint: SHA256:LGomp8Opq0jz+7kbwNcdfTcuaLRb5Nh0k5AchDDb438

View file

@ -2,12 +2,6 @@
# #
# openssl rand -hex 20 # openssl rand -hex 20
volumes:
docker_certs:
forgejo_data:
runner_data:
services: services:
docker-in-docker: docker-in-docker:
@ -18,7 +12,7 @@ services:
DOCKER_TLS_CERTDIR: /certs DOCKER_TLS_CERTDIR: /certs
DOCKER_HOST: docker-in-docker DOCKER_HOST: docker-in-docker
volumes: volumes:
- docker_certs:/certs - ${ROOT_DIR}/docker_certs:/certs
forgejo: forgejo:
image: codeberg.org/forgejo/forgejo:8 image: codeberg.org/forgejo/forgejo:8
@ -28,19 +22,17 @@ services:
sleep 10 ; sleep 10 ;
su -c "forgejo forgejo-cli actions register --secret ${SHARED_SECRET}" git ; su -c "forgejo forgejo-cli actions register --secret ${SHARED_SECRET}" git ;
sleep infinity sleep infinity
' '
environment: environment:
FORGEJO__security__INSTALL_LOCK: "true" FORGEJO__security__INSTALL_LOCK: "true"
FORGEJO__log__LEVEL: "debug" FORGEJO__log__LEVEL: "debug"
FORGEJO__repository__ENABLE_PUSH_CREATE_USER: "true" FORGEJO__repository__ENABLE_PUSH_CREATE_USER: "true"
FORGEJO__repository__DEFAULT_PUSH_CREATE_PRIVATE: "false" FORGEJO__repository__DEFAULT_PUSH_CREATE_PRIVATE: "false"
FORGEJO__repository__DEFAULT_REPO_UNITS: "repo.code,repo.actions" FORGEJO__repository__DEFAULT_REPO_UNITS: "repo.code,repo.actions"
FORGEJO__APP_NAME: ${FORGEJO_APP_NAME} FORGEJO__server__ROOT_URL: ${ROOT_URL}
FORGEJO__APP_SLOGAN: ${FORGEJO_APP_SLOGAN}
FORGEJO__server__ROOT_URL: ${FORGEJO_ROOT_URL}
volumes: volumes:
- forgejo_data:/data - ${ROOT_DIR}/forgejo_data:/data
ports: ports:
- '8080:3000' - '8080:3000'
- '2222:22' - '2222:22'
@ -53,7 +45,7 @@ services:
environment: environment:
DOCKER_HOST: tcp://docker-in-docker:2376 DOCKER_HOST: tcp://docker-in-docker:2376
volumes: volumes:
- runner_data:/data - ${ROOT_DIR}/runner_data:/data
user: 0:0 user: 0:0
command: >- command: >-
bash -ec ' bash -ec '
@ -68,7 +60,7 @@ services:
sed -i -e "s|^ options:| options: -v /certs/client:/certs/client|" config.yml ; sed -i -e "s|^ options:| options: -v /certs/client:/certs/client|" config.yml ;
sed -i -e "s| valid_volumes: \[\]$$| valid_volumes:\n - /certs/client|" config.yml ; sed -i -e "s| valid_volumes: \[\]$$| valid_volumes:\n - /certs/client|" config.yml ;
chown -R 1000:1000 /data chown -R 1000:1000 /data
' '
runner-daemon: runner-daemon:
image: code.forgejo.org/forgejo/runner:3.4.1 image: code.forgejo.org/forgejo/runner:3.4.1
@ -80,9 +72,9 @@ services:
DOCKER_CERT_PATH: /certs/client DOCKER_CERT_PATH: /certs/client
DOCKER_TLS_VERIFY: "1" DOCKER_TLS_VERIFY: "1"
volumes: volumes:
- runner_data:/data - ${ROOT_DIR}/runner_data:/data
- docker_certs:/certs - ${ROOT_DIR}/docker_certs:/certs
command: >- command: >-
bash -c ' bash -c '
while : ; do test -w .runner && forgejo-runner --config config.yml daemon ; sleep 1 ; done while : ; do test -w .runner && forgejo-runner --config config.yml daemon ; sleep 1 ; done
' '