Merge branch 'master' of github.com:IoTcat/ushio-docker

home.yimian.xyz/docker-compose.yml

@@ -93,6 +93,21 @@ services:
       - "/mnt/var/ssl/yimian.xyz:/certs"
       - "/var/docker:/var/lib/registry"
 
+  gitea:
+    image: docker.yimian.xyz:5000/gitea
+    environment:
+      - USER_UID=1000
+      - USER_GID=1000
+        #- HTTP_PORT=80
+      - SSH_PORT=4422
+    restart: always
+    volumes:
+      - /home/data/gitea:/data
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+    ports:
+      - "3000:3000"
+      - "222:22"
 
 
   v2ray:
@@ -114,3 +129,4 @@ services:
 networks:
   default:
 
+

usa.yimian.xyz/docker-compose.yml

@@ -4,8 +4,8 @@ services:
 # system-level services
 #--------------------------------
   nginx:
-    #image: iotcat/ushio-nginx
-    image: docker.yimian.xyz/nginx
+    image: iotcat/ushio-nginx
+    #image: docker.yimian.xyz/nginx
     container_name: nginx
     restart: always
     ports:
@@ -28,8 +28,8 @@ services:
       - frp_net
 
   dns:
-    #image: strm/dnsmasq
-    image: docker.yimian.xyz/dnsmasq
+    image: strm/dnsmasq
+    #image: docker.yimian.xyz/dnsmasq
     restart: always
     volumes:
       - /mnt/etc/common/dnsmasq/dnsmasq.conf:/etc/dnsmasq.conf
@@ -46,8 +46,8 @@ services:
 # Database
 #----------------------------------
   redis:
-    #image: redis
-    image: docker.yimian.xyz/redis
+    image: redis
+    #image: docker.yimian.xyz/redis
     container_name: redis
     restart: always
     volumes:
@@ -59,8 +59,8 @@ services:
 # app-level services
 # --------------------------------------
   php-fpm:
-    #image: crunchgeek/php-fpm:7.3
-    image: docker.yimian.xyz/php-fpm
+    image: crunchgeek/php-fpm:7.3
+    #image: docker.yimian.xyz/php-fpm
     container_name: php-fpm
     restart: always
     volumes:
@@ -69,8 +69,8 @@ services:
     networks:
       - php_net
   frps:
-    #image: snowdreamtech/frps
-    image: docker.yimian.xyz/frps
+    image: snowdreamtech/frps
+    #image: docker.yimian.xyz/frps
     container_name: frps
     restart: always
     volumes:
@@ -84,8 +84,8 @@ services:
       - frp_net
   monitor:
     #build: https://github.com/iotcat/ushio-monitor.git
-    #image: iotcat/ushio-monitor
-    image: docker.yimian.xyz/monitor
+    image: iotcat/ushio-monitor
+    #image: docker.yimian.xyz/monitor
     container_name: monitor
     restart: always
     command: USER=usa.yimian.xyz
@@ -93,8 +93,8 @@ services:
 
 
   redrange:
-    #image: wordpress:latest
-    image: docker.yimian.xyz/wordpress
+    image: wordpress:latest
+    #image: docker.yimian.xyz/wordpress
     ports:
       - "8000:80"
     restart: always
@@ -113,8 +113,8 @@ services:
 # ---------------------------------------
 
   v2ray:
-    #image: v2ray/official
-    image: docker.yimian.xyz/v2ray
+    image: v2ray/official
+    #image: docker.yimian.xyz/v2ray
     container_name: v2ray
     restart: always
     volumes:
@@ -123,8 +123,8 @@ services:
 
   ushio-proxy:
     #build: https://github.com/iotcat/ushio-proxy.git
-    #image: iotcat/ushio-proxy
-    image: docker.yimian.xyz/proxy
+    image: iotcat/ushio-proxy
+    #image: docker.yimian.xyz/proxy
     container_name: ushio-proxy
     restart: always
 

usa.yimian.xyz/restart.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+docker-compose pull
+docker-compose down
+docker-compose up -d