κρμγ 6 жил өмнө
parent
commit
e90363c2c1
2 өөрчлөгдсөн 13 нэмэгдсэн , 41 устгасан
  1. 0 29
      .drone-q.yml
  2. 13 12
      .drone.yml

+ 0 - 29
.drone-q.yml

@@ -1,29 +0,0 @@
-version: '3'
-
-services:
-  drone-server:
-    image: drone/drone:0.5
-    ports:
-      - "18000:8000"
-    restart: always
-    depends_on: [ ]
-    volumes:
-     - ./drone:/var/lib/drone/
-    environment:
-      - DRONE_OPEN=true
-      - DRONE_GOGS=true
-      - DRONE_ADMIN=pk
-      - DRONE_SERVER=http://q.ocsf.in:18000
-      - DRONE_GOGS_URL=http://o.ocsf.in:9095
-      - DRONE_SECRET="00018152"
-
-  drone-agent:
-    image: drone/drone:0.5
-    command: agent
-    restart: always
-    depends_on: [ drone-server ]
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    environment:
-      - DRONE_SERVER=ws://q.ocsf.in:18000/ws/broker
-      - DRONE_SECRET="00018152"

+ 13 - 12
.drone-o.yml → .drone.yml

@@ -5,14 +5,14 @@ services:
     image: gogs/gogs
     ports:
       - "9095:3000"
-      - "9096:22"
     restart: always
     volumes:
       - ./gogs:/data
-  drone-server:
-    image: drone/drone:0.5
+  drone_server:
+    image: drone/drone:0.8.5
     ports:
-      - "18000:8000"
+      - "18081:8000"
+      - "9000"
     restart: always
     depends_on: [ gogs ]
     links: 
@@ -22,17 +22,18 @@ services:
     environment:
       - DRONE_OPEN=true
       - DRONE_GOGS=true
-      - DRONE_SERVER=http://drone-server:18000
-      - DRONE_GOGS_URL=http://o.ocsf.in:9095
-      - DRONE_SECRET=00018152
+      - DRONE_HOST=http://q.ocsf.in:18081
+      - DRONE_GOGS_URL=http://q.ocsf.in:9095
+      - DRONE_SECRET="00018152"
+      - DRONE_ADMIN=pk
 
-  drone-agent:
-    image: drone/drone:0.5
+  drone_agent:
+    image: drone/agent:0.8.5
     command: agent
     restart: always
-    depends_on: [ drone-server ]
+    depends_on: [ drone_server ]
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     environment:
-      - DRONE_SERVER=ws://drone-server:8000/ws/broker
-      - DRONE_SECRET=00018152
+      - DRONE_SERVER=drone_server:9000
+      - DRONE_SECRET="00018152"