Quellcode durchsuchen

(hopefully) fixed Compose config

Benoît Hubert vor 3 Jahren
Ursprung
Commit
35a0ef5efc
2 geänderte Dateien mit 38 neuen und 5 gelöschten Zeilen
  1. 32 0
      README.md
  2. 6 5
      docker-compose.yml

+ 32 - 0
README.md

@@ -59,6 +59,38 @@ UPDATE repos SET repo_clone_url = 'http://gitea:3000/benoit/gitea-drone.git' WHE
 * `DRONE_SERVER_HOST` is the host address from the outside (not for inside the Docker network)
 * Forgot to put Drone Server & Client on the same network as Gitea & MySQL :sweat_smile:
 
+## Ideas
+
+To get same hostnames inside containers/VMs than outside
+
+* Using Acrylic, localdns, dnsmasq
+* SSH tunnel
+* Reverse proxy from nginx/apache/caddy on localhost
+
+## Stuff that helped
+
+* [[SOLVED] Making drone listen on port different than 443](https://discourse.drone.io/t/solved-making-drone-listen-on-port-different-than-443/8274)
+* [Drone Server / Gitea](https://docs.drone.io/server/provider/gitea/)
+
+## Run Drone Server without Compose
+```
+docker run \
+  --volume=/var/lib/drone:/data \
+  --env=DRONE_GITEA_SERVER=https://try.gitea.io \
+  --env=DRONE_GITEA_CLIENT_ID=05136e57d80189bef462 \
+  --env=DRONE_GITEA_CLIENT_SECRET=7c229228a77d2cbddaa61ddc78d45e \
+  --env=DRONE_RPC_SECRET=super-duper-secret \
+  --env=DRONE_SERVER_HOST=drone:8080 \
+  --env=DRONE_SERVER_PORT=:8080 \
+  --env=DRONE_SERVER_PROTO=https \
+  --publish=8080:8080 \
+  --publish=443:443 \
+  --restart=always \
+  --detach=true \
+  --name=drone \
+  drone/drone:2
+```
+
 ## TODO
 
 * Don't hardcode secrets in Compose file!

+ 6 - 5
docker-compose.yml

@@ -51,13 +51,14 @@ services:
       - ./drone-server:/data
     environment:
       - DRONE_GITEA_SERVER=http://gitea:3000
-      - DRONE_GITEA_CLIENT_ID=c46897dd-a9fd-4e15-943d-63b983f782f1
-      - DRONE_GITEA_CLIENT_SECRET=C8uUrWxSLRbzTkXlLdqjj5oS6wCW6sFavDyUjm3piQmB
+      - DRONE_GITEA_CLIENT_ID=a01ece3d-9486-4c50-9f8f-7db1284c1c1d
+      - DRONE_GITEA_CLIENT_SECRET=Zlt805jaAswGjufEiuGKjQ7VgV0NSAxITMpm7SshesLT
       - DRONE_RPC_SECRET=760d5e2dbac871f5d671078d97e6401b
-      - DRONE_SERVER_HOST=localhost:8080
+      - DRONE_SERVER_HOST=drone:8080
+      - DRONE_SERVER_PORT=:8080
       - DRONE_SERVER_PROTO=http
     ports:
-      - "8080:80"
+      - "8080:8080"
       # for HTTPS and SSH
       - "443:443"
       # - "222:22"
@@ -72,7 +73,7 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
     environment:
       - DRONE_RPC_PROTO=http
-      - DRONE_RPC_HOST=drone_server
+      - DRONE_RPC_HOST=drone_server:8080
       - DRONE_RPC_SECRET=760d5e2dbac871f5d671078d97e6401b
       - DRONE_RUNNER_CAPACITY=2
       - DRONE_RUNNER_NAME=my-runner