update image struct and update ci

.gitlab-ci.yml

@@ -5,11 +5,17 @@ stages:
 variables:
   GIT_DEPTH: "1"
   CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+  CONTAINER_TEST_IMAGE_LITE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-lite
   CONTAINER_TEST_IMAGE_X: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-x
+  CONTAINER_TEST_IMAGE_NOVNC: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-novnc
   CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest
+  CONTAINER_RELEASE_IMAGE_LITE: $CI_REGISTRY_IMAGE:lite
   CONTAINER_RELEASE_IMAGE_X: $CI_REGISTRY_IMAGE:x
+  CONTAINER_RELEASE_IMAGE_NOVNC: $CI_REGISTRY_IMAGE:novnc
   DOCKERHUB_RELEASE_IMAGE: nanahira/mirai-cqhttp:latest
+  DOCKERHUB_RELEASE_IMAGE_LITE: nanahira/mirai-cqhttp:lite
   DOCKERHUB_RELEASE_IMAGE_X: nanahira/mirai-cqhttp:x
+  DOCKERHUB_RELEASE_IMAGE_NOVNC: nanahira/mirai-cqhttp:novnc
 
 before_script:
   - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
@@ -19,19 +25,23 @@ build:
   tags: 
     - docker
   script:
-    - docker build --pull --no-cache -t $CONTAINER_TEST_IMAGE .
-    - docker build -t $CONTAINER_TEST_IMAGE_X -f Dockerfile.x --build-arg BASE_IMAGE=$CONTAINER_TEST_IMAGE .
-    - docker push $CONTAINER_TEST_IMAGE
+    - docker build --pull --no-cache -t $CONTAINER_TEST_IMAGE_LITE .
+    - docker build -t $CONTAINER_TEST_IMAGE_X -f Dockerfile.x --build-arg BASE_IMAGE=$CONTAINER_TEST_IMAGE_LITE .
+    - docker build -t $CONTAINER_TEST_IMAGE_NOVNC -f Dockerfile.xnovnc --build-arg BASE_IMAGE=$CONTAINER_TEST_IMAGE_X .
+    - docker tag $CONTAINER_TEST_IMAGE_NOVNC $CONTAINER_TEST_IMAGE
+    - docker push $CONTAINER_TEST_IMAGE_LITE
     - docker push $CONTAINER_TEST_IMAGE_X
+    - docker push $CONTAINER_TEST_IMAGE_NOVNC
+    - docker push $CONTAINER_TEST_IMAGE
 
-deploy_latest:
+deploy_latest_lite:
   stage: deploy
   tags: 
     - docker
   script:
-    - docker pull $CONTAINER_TEST_IMAGE
-    - docker tag $CONTAINER_TEST_IMAGE $CONTAINER_RELEASE_IMAGE
-    - docker push $CONTAINER_RELEASE_IMAGE
+    - docker pull $CONTAINER_TEST_IMAGE_LITE
+    - docker tag $CONTAINER_TEST_IMAGE_LITE $CONTAINER_RELEASE_IMAGE_LITE
+    - docker push $CONTAINER_RELEASE_IMAGE_LITE
   only:
     - master
 
@@ -46,51 +56,52 @@ deploy_latest_x:
   only:
     - master
 
-deploy_dockerhub_latest:
+deploy_latest_novnc:
   stage: deploy
   tags: 
     - docker
   script:
-    - docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
-    - docker pull $CONTAINER_TEST_IMAGE
-    - docker tag $CONTAINER_TEST_IMAGE $DOCKERHUB_RELEASE_IMAGE
-    - docker push $DOCKERHUB_RELEASE_IMAGE
+    - docker pull $CONTAINER_TEST_IMAGE_NOVNC
+    - docker tag $CONTAINER_TEST_IMAGE_NOVNC $CONTAINER_RELEASE_IMAGE_NOVNC
+    - docker tag $CONTAINER_TEST_IMAGE_NOVNC $CONTAINER_RELEASE_IMAGE
+    - docker push $CONTAINER_RELEASE_IMAGE_NOVNC
+    - docker push $CONTAINER_RELEASE_IMAGE
   only:
     - master
 
-deploy_dockerhub_x:
+deploy_dockerhub_lite:
   stage: deploy
   tags: 
     - docker
   script:
     - docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
-    - docker pull $CONTAINER_TEST_IMAGE_X
-    - docker tag $CONTAINER_TEST_IMAGE_X $DOCKERHUB_RELEASE_IMAGE_X
-    - docker push $DOCKERHUB_RELEASE_IMAGE_X
+    - docker pull $CONTAINER_TEST_IMAGE_LITE
+    - docker tag $CONTAINER_TEST_IMAGE_LITE $DOCKERHUB_RELEASE_IMAGE_LITE
+    - docker push $DOCKERHUB_RELEASE_IMAGE_LITE
   only:
     - master
 
-deploy_tag:
+deploy_dockerhub_x:
   stage: deploy
   tags: 
     - docker
-  variables:
-    CONTAINER_TAG_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
   script:
-    - docker pull $CONTAINER_TEST_IMAGE
-    - docker tag $CONTAINER_TEST_IMAGE $CONTAINER_TAG_IMAGE
-    - docker push $CONTAINER_TAG_IMAGE
+    - docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
+    - docker pull $CONTAINER_TEST_IMAGE_X
+    - docker tag $CONTAINER_TEST_IMAGE_X $DOCKERHUB_RELEASE_IMAGE_X
+    - docker push $DOCKERHUB_RELEASE_IMAGE_X
   only:
-    - tags
-deploy_tag_x:
+    - master
+deploy_dockerhub_novnc:
   stage: deploy
   tags: 
     - docker
-  variables:
-    CONTAINER_TAG_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG-x
   script:
-    - docker pull $CONTAINER_TEST_IMAGE_X
-    - docker tag $CONTAINER_TEST_IMAGE_X $CONTAINER_TAG_IMAGE
-    - docker push $CONTAINER_TAG_IMAGE
+    - docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
+    - docker pull $CONTAINER_TEST_IMAGE_NOVNC
+    - docker tag $CONTAINER_TEST_IMAGE_NOVNC $DOCKERHUB_RELEASE_IMAGE_NOVNC
+    - docker tag $CONTAINER_TEST_IMAGE_NOVNC $DOCKERHUB_RELEASE_IMAGE
+    - docker push $DOCKERHUB_RELEASE_IMAGE_NOVNC
+    - docker push $DOCKERHUB_RELEASE_IMAGE
   only:
-    - tags
+    - master

README.md

@@ -70,12 +70,14 @@ services:
 
 ## Tag
 
-* `latest` 无 GUI 镜像。需要有现成的 `devices.json` 文件。
+* `lite` 无 GUI 镜像。需要有现成的 `devices.json` 文件。
 
 * `x` 带 GUI 镜像，需要配合 noVNC 使用以拉滑块。
 
 * `novnc` 带 GUI 和 noVNC 镜像，可以直接拉滑块。noVNC 监听在 8080 端口。
 
+* `latest` 同 `novnc`。
+
 ## 环境变量
 
 ### 默认值