fixed git setup
This commit is contained in:
parent
c727690c64
commit
8441ac269b
1 changed files with 5 additions and 30 deletions
|
@ -1,9 +1,8 @@
|
||||||
# SAMPLE ENV
|
# SAMPLE ENV
|
||||||
# SHARED_SECRET=super-secret-string
|
# SHARED_SECRET=super-secret-string
|
||||||
# ROOT_PASSWORD=super-secret-password
|
# ROOT_PASSWORD=super-secret-password
|
||||||
# ROOT_URL=https://git.cool.website
|
|
||||||
|
|
||||||
version: '3'
|
version: "3"
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
docker_certs:
|
docker_certs:
|
||||||
|
@ -12,37 +11,13 @@ services:
|
||||||
docker-in-docker:
|
docker-in-docker:
|
||||||
image: docker:dind
|
image: docker:dind
|
||||||
hostname: docker
|
hostname: docker
|
||||||
privileged: true
|
privileged: true
|
||||||
environment:
|
environment:
|
||||||
DOCKER_TLS_CERTDIR: /certs
|
DOCKER_TLS_CERTDIR: /certs
|
||||||
DOCKER_HOST: docker-in-docker
|
DOCKER_HOST: docker-in-docker
|
||||||
volumes:
|
volumes:
|
||||||
- docker_certs:/certs
|
- docker_certs:/certs
|
||||||
|
|
||||||
forgejo:
|
|
||||||
image: codeberg.org/forgejo/forgejo:1.21
|
|
||||||
command: >-
|
|
||||||
bash -c '
|
|
||||||
/bin/s6-svscan /etc/s6 &
|
|
||||||
sleep 10 ;
|
|
||||||
su -c "forgejo forgejo-cli actions register --secret ${SHARED_SECRET}" git ;
|
|
||||||
su -c "forgejo admin user create --admin --username root --password ${ROOT_PASSWORD} --email root@example.com" git ;
|
|
||||||
sleep infinity
|
|
||||||
'
|
|
||||||
environment:
|
|
||||||
FORGEJO__security__INSTALL_LOCK: "true"
|
|
||||||
FORGEJO__log__LEVEL: "debug"
|
|
||||||
FORGEJO__repository__ENABLE_PUSH_CREATE_USER: "true"
|
|
||||||
FORGEJO__repository__DEFAULT_PUSH_CREATE_PRIVATE: "false"
|
|
||||||
FORGEJO__repository__DEFAULT_REPO_UNITS: "repo.code,repo.actions"
|
|
||||||
FORGEJO__server__ROOT_URL: $ROOT_URL
|
|
||||||
SHARED_SECRET: $SHARED_SECRET
|
|
||||||
ROOT_PASSWORD: $ROOT_PASSWORD
|
|
||||||
volumes:
|
|
||||||
- /srv/forgejo-data:/data
|
|
||||||
ports:
|
|
||||||
- 8090:3000
|
|
||||||
|
|
||||||
runner-register:
|
runner-register:
|
||||||
image: code.forgejo.org/forgejo/runner:3.4.1
|
image: code.forgejo.org/forgejo/runner:3.4.1
|
||||||
links:
|
links:
|
||||||
|
@ -57,7 +32,7 @@ services:
|
||||||
command: >-
|
command: >-
|
||||||
bash -ec '
|
bash -ec '
|
||||||
while : ; do
|
while : ; do
|
||||||
forgejo-runner create-runner-file --connect --instance http://forgejo:3000 --name runner --secret ${SHARED_SECRET} && break ;
|
forgejo-runner create-runner-file --connect --instance http://codeberg.org --name runner --secret ${SHARED_SECRET} && break ;
|
||||||
sleep 1 ;
|
sleep 1 ;
|
||||||
done ;
|
done ;
|
||||||
sed -i -e "s|\"labels\": null|\"labels\": [\"docker:docker://node:20-bookworm\", \"ubuntu-22.04:docker://catthehacker/ubuntu:act-22.04\"]|" .runner ;
|
sed -i -e "s|\"labels\": null|\"labels\": [\"docker:docker://node:20-bookworm\", \"ubuntu-22.04:docker://catthehacker/ubuntu:act-22.04\"]|" .runner ;
|
||||||
|
@ -67,7 +42,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
|
||||||
|
@ -84,4 +59,4 @@ services:
|
||||||
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
|
||||||
'
|
'
|
Loading…
Add table
Reference in a new issue