diff --git a/.drone.yml b/.drone.yml index 2fdd9c3..fa52616 100644 --- a/.drone.yml +++ b/.drone.yml @@ -22,7 +22,7 @@ steps: password: from_secret: ssh_password target: ~/publish/cicd/~/publish - source: docker-compose.yml + source: ./ - name: restart image: appleboy/drone-ssh:linux-amd64 settings: diff --git a/.env.example b/.env.example index ced3fa0..87844a0 100644 --- a/.env.example +++ b/.env.example @@ -1,3 +1,4 @@ +DATA=../data/ TZ=Asia/Shanghai # required diff --git a/docker-compose.yml b/docker-compose.yml index 82069a3..deee1e8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,7 +15,7 @@ services: - 9000:9000 volumes: - ${DOCKER_SOCK}:/var/run/docker.sock - - ../data/portainer:/data + - ${Data}portainer:/data netdata: image: netdata/netdata:v1.30.0 restart: always @@ -39,7 +39,7 @@ services: ports: - 5000:5000 #http://localhost:5000/v2/_catalog volumes: - - ../data/registry:/var/lib/registry + - ${Data}registry:/var/lib/registry docker-registry-ui: image: joxit/docker-registry-ui:2.0 restart: always @@ -65,7 +65,7 @@ services: - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro - ./conf/gitea/custom:/data/gitea/custom - - ../data/gitea:/data + - ${Data}gitea:/data drone: #https://docs.drone.io/server/provider/gitea/ https://github.com/drone/drone image: drone/drone:2.0.1 restart: always @@ -81,7 +81,7 @@ services: - DRONE_SERVER_PROTO=${DRONE_SERVER_PROTO} - DRONE_USER_CREATE=username:root,machine:false,admin:true,token:55f24eb3d61ef6ac5e83d550178638dc volumes: - - ../data/drone:/data + - ${Data}drone:/data depends_on: - gitea - registry