manifests/forgejo/runner.yaml

@@ -24,12 +24,8 @@ spec:
               --instance ${FORGEJO_INSTANCE_URL} \
               --token ${FORGEJO_RUNNER_REGISTRATION_TOKEN} \
               --name ${FORGEJO_RUNNER_NAME} \
-              --labels docker:docker://node:22-alpine && \
-<<<<<<< HEAD
+              --labels docker:docker://alpine:latest && \
             sleep 5 && \  
-=======
-            sleep 5 && \
->>>>>>> main
             forgejo-runner daemon
         env:
         - name: FORGEJO_INSTANCE_URL