piclist 1.6.6 → 1.6.8

package/.github/workflows/docker.yml

@@ -0,0 +1,40 @@
+name: Build and Push Docker Image
+
+on:
+  push:
+    tags:
+      - '*'
+  workflow_dispatch:
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout Repository
+      uses: actions/checkout@v2
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+
+    - name: Login to Docker Hub
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }}
+
+    - name: Build and Push Docker Image
+      uses: docker/build-push-action@v2
+      with:
+        context: .
+        file: ./Dockerfile
+        push: true
+        tags: kuingsmile/piclist:latest
+
+    - name: Build and Push Docker Image with Tag
+      if: startsWith(github.ref, 'refs/tags/')
+      uses: docker/build-push-action@v2
+      with:
+        context: .
+        file: ./Dockerfile
+        push: true
+        tags: kuingsmile/piclist:${{ github.ref_name }}

package/Dockerfile

@@ -0,0 +1,9 @@
+FROM node:lts-alpine
+
+RUN yarn config set registry https://registry.npmmirror.com/ && \
+    yarn config set sharp_binary_host "https://npmmirror.com/mirrors/sharp" && \
+    yarn config set sharp_libvips_binary_host "https://npmmirror.com/mirrors/sharp-libvips" && \
+    yarn global add piclist && \
+    rm -rf /var/cache/apk/* /tmp/*
+
+EXPOSE 36677

package/README.md

@@ -59,6 +59,51 @@ yarn add piclist -D
 
 ## Usage
 
+### Docker
+
+You can use docker to run PicList-Core.
+
+#### docker run
+
+Change the `./piclist` to your own path, and change the `piclist123456` to your own secret key.
+
+```bash
+docker run -d \
+  --name piclist \
+  --restart always \
+  -p 36677:36677 \
+  -v "./piclist:/root/.piclist" \
+  kuingsmile/piclist:latest \
+  node /usr/local/bin/picgo-server -k piclist123456
+```
+
+#### docker-compose
+
+download `docker-compose.yml` from this repo, or copy the following content to `docker-compose.yml`:
+
+```yaml
+version: '3.3'
+
+services:
+  node:
+    image: 'kuingsmile/piclist:latest'
+    container_name: piclist
+    restart: always
+    ports:
+      - 36677:36677
+    volumes:
+      - './piclist:/root/.piclist'
+    command: node /usr/local/bin/picgo-server -k piclist123456
+```
+
+You can change the `volumes` to your own path and change the `command` to your own secret key.
+
+Then run:
+
+```bash
+docker-compose up -d
+```
+
 ### Server
 
 You can use `picgo-server` to start a server, default port is `36677`.

package/bin/picgo-server

@@ -63,6 +63,7 @@ function showHelp() {
 
 let configPath = argv.c || argv.config || ''
 if (configPath !== true && configPath !== '') {
+  configPath = configPath.replace(/^~/, os.homedir())
   configPath = path.resolve(configPath)
 } else {
   configPath = ''
@@ -171,7 +172,7 @@ router.post('/upload', async ({ response, list = [], urlparams }) => {
       // upload with clipboard
       console.log('[PicList Server] upload clipboard file')
       const result = await picgo.upload()
-      const res = result.imgUrl
+      const res = result[0].imgUrl
       console.log('[PicList Server] upload result:', res)
       if (res) {
         handleResponse({