ad drone and fix hostnames

This commit is contained in:
James 2020-12-28 17:09:06 +00:00
parent 6e5f8e4626
commit 4992be55b9
3 changed files with 69 additions and 4 deletions

View File

@ -1,6 +1,7 @@
version: '3.1' version: '3.1'
services: services:
gitea-dev: gitea:
hostname: gitea
build: build:
context: dev context: dev
args: args:
@ -12,9 +13,71 @@ services:
volumes: volumes:
- ./home:/home - ./home:/home
- ./src:/src - ./src:/src
network_mode: "host" # network_mode: "host"
networks:
- drone
command: ./gitea
# networks: # networks:
# default: # default:
# external: # external:
# name: default # name: default
drone:
hostname: drone
image: drone/drone:1.10.0
ports:
- 8080:80
networks:
- drone
# network_mode: "host"
volumes:
- ./drone_data/:/data
restart: always
environment:
- DRONE_GITEA_SERVER=http://gitea:3000
- DRONE_GITEA_CLIENT_ID=f0cba0cb-9222-42ab-8ddd-248290e45fc2
#3687a1e9-47cc-49b9-bcff-7651162181b8
- DRONE_GITEA_CLIENT_SECRET=ivkumgIrLuQp-ttPhWMlAXzLqDXbpzUXMye611dHTMw=
#Prgm4MBf4vZJwDRWakNqGT4VC5PlC0VuKn4qVOJpaWY=
- DRONE_RPC_SECRET=42240802e1b2ad6f156f5acd05f2ca90
- DRONE_SERVER_HOST=drone
- DRONE_SERVER_PROTO=http
- DRONE_USER_CREATE=username:jhodges,admin:true
drone-runner:
image: drone/drone-runner-docker:1.6.1
command: agent
restart: always
# network_mode: "host"
depends_on:
- drone
networks:
- drone
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- /var/lib/drone-composer-cache/:/root/.composer/cache
environment:
- DRONE_RPC_PROTO=http
- DRONE_RPC_HOST=drone
- DRONE_RPC_SECRET=42240802e1b2ad6f156f5acd05f2ca90
- DRONE_RUNNER_CAPACITY=2
- DRONE_RUNNER_NAME=runner
database:
image: mariadb:10.3
restart: always
environment:
MYSQL_ROOT_PASSWORD: root
MYSQL_DATABASE: db
MYSQL_USER: user
MYSQL_PASSWORD: pass
volumes:
- ./mysql:/var/lib/mysql
networks:
- drone
networks:
drone:
name: drone_network

View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash
docker-compose run gitea-dev make
export UID=$(id -u) export UID=$(id -u)
export GID=$(id -g) export GID=$(id -g)
docker-compose run gitea make

4
run.sh
View File

@ -1,2 +1,4 @@
#!/bin/bash #!/bin/bash
docker-compose run gitea-dev ./gitea export UID=$(id -u)
export GID=$(id -g)
docker-compose run gitea ./gitea