diff --git a/docker-compose.yml b/docker-compose.yml index 8e656f032..63049194f 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -166,6 +166,26 @@ services: - mariadb restart: unless-stopped + okr: + container_name: "dootask-okr-${APP_ID}" + image: "hitosea2020/okr:0.0.1" + environment: + TZ: "Asia/Shanghai" + MYSQL_HOST: "${DB_HOST}" + MYSQL_PORT: "${DB_PORT}" + MYSQL_DBNAME: "${DB_DATABASE}" + MYSQL_USERNAME: "${DB_USERNAME}" + MYSQL_PASSWORD: "${DB_PASSWORD}" + DOO_TASK_URL: "http://${APP_IPPR}.3" + + networks: + extnetwork: + ipv4_address: "${APP_IPPR}.13" + depends_on: + - mariadb + restart: unless-stopped + + networks: extnetwork: name: "dootask-networks-${APP_ID}" diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf index e83c36182..0ac73532f 100644 --- a/docker/nginx/default.conf +++ b/docker/nginx/default.conf @@ -186,7 +186,7 @@ server { # OKR location /apps/okr/ { - proxy_pass http://192.168.100.88:5566/apps/okr/; + proxy_pass http://okr:5566/apps/okr/; } } diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss index 4251ffa07..f61a59855 100644 --- a/resources/assets/sass/pages/components/dialog-wrapper.scss +++ b/resources/assets/sass/pages/components/dialog-wrapper.scss @@ -701,7 +701,7 @@ margin: 0; } - &.task { + &.task,&.okr { cursor: pointer; }