Merge remote-tracking branch 'origin/master'

# Conflicts:
#	routes/overview.js

.github/workflows/docker-image.yml

@@ -0,0 +1,41 @@
+name: build_docker
+
+on:
+  push:
+    branches: [master]
+  release:
+    types: [created] # 表示在创建新的 Release 时触发
+
+jobs:
+  build_docker:
+    name: Build docker
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - run: |
+          echo "本次构建的版本为：${GITHUB_REF_NAME} (但是这个变量目前上下文中无法获取到)"
+          echo 本次构建的版本为：${{ github.ref_name }} ${{ secrets.DOCKERHUB_USERNAME }}
+          env
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: true
+          labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64,linux/arm64
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/easydockerweb:${{ github.ref_name }}
+            ${{ secrets.DOCKERHUB_USERNAME }}/easydockerweb:latest

Dockerfile

@@ -1,10 +1,10 @@
-FROM node:9-alpine
-ADD . /src
 
+FROM node:lts-alpine
+COPY . /src
 RUN apk update && apk add bash && \
     cd /src; yarn install && \
     # Time zone option, if you live in China pleace set it to Asia/Shanghai
     ln -sf /usr/share/zoneinfo/Europe/Paris /etc/localtime
-    
+
 EXPOSE  3000
 CMD node /src/bin/www

README.md

@@ -56,6 +56,7 @@ docker run -p 3000:3000 -v /var/run/docker.sock:/var/run/docker.sock easy-docker
 - 系统状态查看
 - 镜像获取
 - 计划使用react重构 https://github.com/qfdk/EasyDockerWeb/tree/react
+- 添加git actions
 
 ## Images
 ![login](./images/login.png)
@@ -77,11 +78,11 @@ docker run -p 3000:3000 -v /var/run/docker.sock:/var/run/docker.sock easy-docker
 ## Sponsor
 <a href="https://www.jetbrains.com/?from=EasyDockerWeb"><img src="images/jetbrains-variant-4.svg" alt="JetBrains" width="200"/></a>
 
-## React.js web ui (beta)
+## React.js web ui (removed)
 
 ```bash
 cd web-ui
-yarn install
+yarn
 yarn start
 ```
 [http://localhost:4000](http://localhost:4000)

app.js

@@ -44,7 +44,7 @@ app.all('*', (req, res, next) => {
         'Content-Type, Content-Length, Authorization, Accept, X-Requested-With , yourHeaderFeild');
     res.header('Access-Control-Allow-Methods',
         'PUT, POST, GET, DELETE, OPTIONS');
-    if (req.method == 'OPTIONS') {
+    if (req.method === 'OPTIONS') {
         res.send(200); /* speedup options */
     } else {
         next();
@@ -74,7 +74,6 @@ app.use((err, req, res, next) => {
     // set locals, only providing error in development
     res.locals.message = err.message;
     res.locals.error = req.app.get('env') === 'development' ? err : {};
-
     // render the error page
     res.status(err.status || 500);
     res.render('error');

middlewares/security.js

@@ -18,5 +18,5 @@ const checkUser = (req, res, next) => {
 };
 
 module.exports = {
-    checkUser,
+    checkUser
 };

package.json

@@ -6,17 +6,16 @@
     "start": "nodemon ./bin/www"
   },
   "dependencies": {
-    "babel-preset-react-app": "^9.1.1",
-    "body-parser": "~1.18.2",
-    "dockerode": "^2.5.4",
-    "ejs": "^2.5.7",
+    "body-parser": "1.20.1",
+    "dockerode": "^4.0.2",
+    "ejs": "3.1.7",
     "express": "^4.16.4",
     "express-session": "^1.17.1",
     "express-status-monitor": "^1.2.8",
     "serve-favicon": "^2.4.5",
     "socket.io": "2.4.1"
   },
   "devDependencies": {
-    "nodemon": "^2.0.4"
+    "nodemon": "^3.0.3"
   }
 }