merith-tk/forgejo-runner
1
0
Fork 0
Code Issues Pull requests 2 Projects Releases Packages Wiki Activity Actions

Merge pull request 'Use forgejo mirror images' (#250) from chore/mirror-images into main

Browse source 
Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/250
Reviewed-by: earl-warren <earl-warren@noreply.code.forgejo.org>
This commit is contained in:
earl-warren 2024-08-13 07:11:08 +00:00
commit 8509c33a07
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.forgejo/testdata/ipv6.yml vendored
View file

@ -4,7 +4,7 @@ jobs:
ipv6: ipv6:
runs-on: docker runs-on: docker
container: container:
image: debian:bookworm image: code.forgejo.org/oci/debian:bookworm
steps: steps:
- run: | - run: |
apt update -qq ; apt --quiet install -qq --yes iputils-ping apt update -qq ; apt --quiet install -qq --yes iputils-ping

2
.forgejo/workflows/example-docker-compose.yml
View file

@ -61,7 +61,7 @@ jobs:
done done
grep --quiet "$success" /tmp/out grep --quiet "$success" /tmp/out
$cli logs runner-daemon > /tmp/runner.log $cli logs runner-daemon > /tmp/runner.log
grep --quiet 'Start image=node:20-bookworm' /tmp/runner.log grep --quiet 'Start image=code.forgejo.org/oci/node:20-bookworm' /tmp/runner.log
- name: full docker compose logs - name: full docker compose logs
if: always() if: always()

2
examples/docker-compose/compose-demo-workflow.yml
View file

@ -4,7 +4,7 @@
services: services:
demo-workflow: demo-workflow:
image: alpine:3.19 image: code.forgejo.org/oci/alpine:3.19
links: links:
- forgejo - forgejo
command: >- command: >-

4
examples/docker-compose/compose-forgejo-and-runner.yml
View file

@ -22,7 +22,7 @@ services:
docker-in-docker: docker-in-docker:
image: docker:dind image: docker:dind
hostname: docker # Must set hostname as TLS certificates are only valid for docker or localhost hostname: docker # Must set hostname as TLS certificates are only valid for docker or localhost
privileged: true privileged: true
environment: environment:
DOCKER_TLS_CERTDIR: /certs DOCKER_TLS_CERTDIR: /certs
DOCKER_HOST: docker-in-docker DOCKER_HOST: docker-in-docker
@ -66,7 +66,7 @@ services:
forgejo-runner create-runner-file --connect --instance http://forgejo:3000 --name runner --secret {SHARED_SECRET} && break ; forgejo-runner create-runner-file --connect --instance http://forgejo:3000 --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://code.forgejo.org/oci/node:20-bookworm\", \"ubuntu-22.04:docker://catthehacker/ubuntu:act-22.04\"]|" .runner ;
forgejo-runner generate-config > config.yml ; forgejo-runner generate-config > config.yml ;
sed -i -e "s|network: .*|network: host|" config.yml ; sed -i -e "s|network: .*|network: host|" config.yml ;
sed -i -e "s|^ envs:$$| envs:\n DOCKER_HOST: tcp://docker:2376\n DOCKER_TLS_VERIFY: 1\n DOCKER_CERT_PATH: /certs/client|" config.yml ; sed -i -e "s|^ envs:$$| envs:\n DOCKER_HOST: tcp://docker:2376\n DOCKER_TLS_VERIFY: 1\n DOCKER_CERT_PATH: /certs/client|" config.yml ;