From a0ce1562ac0d68fbe6e336365924ace6312b4c56 Mon Sep 17 00:00:00 2001 From: whyour Date: Wed, 12 Jan 2022 00:55:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/Dockerfile | 18 +++--------------- src/pages/script/editModal.tsx | 3 +++ 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 10153235..8fe95376 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -31,25 +31,13 @@ RUN set -x \ python2 \ g++ \ make \ - sqlite \ - sqlite-dev \ - && git clone -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \ - && git config --global user.email "qinglong@@users.noreply.github.com" \ - && git config --global user.name "qinglong" \ - && wget https://github.com/mapbox/node-sqlite3/archive/v5.0.2.zip -O /ql/sqlite3.zip \ - && mkdir -p /ql/sqlite3 \ - && mkdir -p /ql/node_modules/sqlite3 \ - && unzip /ql/sqlite3.zip -d /ql/sqlite3 \ - && cd /ql/sqlite3/node-sqlite3-5.0.2 \ - && npm install \ - && ./node_modules/.bin/node-pre-gyp install --fallback-to-build --build-from-source --sqlite=/usr/bin --python=$(which python) \ - && mv /ql/sqlite3/node-sqlite3-5.0.2 /ql/node_modules/sqlite3 \ - && apk del g++ make python2 \ - && rm -Rf /ql/sqlite3 /ql/sqlite3.zip \ && rm -rf /var/cache/apk/* \ && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ && echo "Asia/Shanghai" > /etc/timezone \ && touch ~/.bashrc \ + && git clone -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \ + && git config --global user.email "qinglong@@users.noreply.github.com" \ + && git config --global user.name "qinglong" \ && cd ${QL_DIR} \ && cp -f .env.example .env \ && chmod 777 ${QL_DIR}/shell/*.sh \ diff --git a/src/pages/script/editModal.tsx b/src/pages/script/editModal.tsx index f5ca8494..016d0fcc 100644 --- a/src/pages/script/editModal.tsx +++ b/src/pages/script/editModal.tsx @@ -87,6 +87,9 @@ const EditModal = ({ }; const stop = () => { + if (!cNode || !cNode.value) { + return; + } request .put(`${config.apiPrefix}scripts/stop`, { data: {