From 45d735cd63019cca0fc54eed92591c41ef7cbe72 Mon Sep 17 00:00:00 2001
From: "luk.lu" <luk.lu@faronear.org>
Date: Sun, 4 Dec 2022 10:39:26 +0800
Subject: [PATCH] u

---
 docker-install.sh                  |  3 +++
 uniapp-cli.Dockerfile              | 17 +++++++++++++++++
 vue-cli-uniapp.sh => uniapp-cli.sh |  3 +--
 vue-cli-uniapp.Dockerfile          | 13 -------------
 4 files changed, 21 insertions(+), 15 deletions(-)
 create mode 100644 uniapp-cli.Dockerfile
 rename vue-cli-uniapp.sh => uniapp-cli.sh (96%)
 delete mode 100644 vue-cli-uniapp.Dockerfile

diff --git a/docker-install.sh b/docker-install.sh
index 0eafa4e..9594838 100755
--- a/docker-install.sh
+++ b/docker-install.sh
@@ -40,6 +40,9 @@ echo Install Docker Engine ...
 sudo apt-get update
 sudo apt-get install docker-ce docker-ce-cli containerd.io docker-compose-plugin -y
 
+docker -v
+docker compose version
+
 # 或者手动安装 compose https://docs.docker.com/compose/install/linux/
 # echo Install Docker-Compose ...
 # sudo curl -L $COMPOSE_URL/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
diff --git a/uniapp-cli.Dockerfile b/uniapp-cli.Dockerfile
new file mode 100644
index 0000000..eb4118b
--- /dev/null
+++ b/uniapp-cli.Dockerfile
@@ -0,0 +1,17 @@
+FROM node:16.18-bullseye
+LABEL org.opencontainers.image.authors="luk"
+
+RUN npm i -g --registry https://registry.npm.taobao.org @vue/cli@4
+RUN cd / && echo -e "\n" | vue create --registry https://registry.npm.taobao.org -p dcloudio/uni-preset-vue uniapp-cli
+RUN cd /uniapp-cli && npm i -D --registry https://registry.npm.taobao.org sass@1.49.8 sass-loader@8.0.2
+
+EXPOSE 8080
+
+CMD cd /uniapp-cli && npm run serve
+
+# docker commit [container-id] [new-image-name]
+# docker build -t uniapp-cli:node16.18-alpine3.16 .
+# docker tag [image] anolaxy/uniapp-cli:node16.18-alpine3.16
+# docker login
+# docker push anolaxy/uniapp-cli:node16.18-alpine3.16
+# docker run -d -p 8080:8080 -v /home/adot/pex-user-uniapp:/uniapp-cli/src luk/uniapp-cli
diff --git a/vue-cli-uniapp.sh b/uniapp-cli.sh
similarity index 96%
rename from vue-cli-uniapp.sh
rename to uniapp-cli.sh
index 9abb934..f0813fd 100644
--- a/vue-cli-uniapp.sh
+++ b/uniapp-cli.sh
@@ -25,8 +25,7 @@ then
   npm run boot
   cd ..
   echo
-  echo *** `npm run serve` to start
-  echo
+  npm run serve
 fi
 
 ## 如果 vue create 选择默认模板，生成的 package.json 其实和 Hello 版一摸一样，只是 devDependencies 缺少了 sass ^1.49.8 和 sass-loader ^8.0.2。
diff --git a/vue-cli-uniapp.Dockerfile b/vue-cli-uniapp.Dockerfile
deleted file mode 100644
index b35425b..0000000
--- a/vue-cli-uniapp.Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM node:16
-LABEL luk "luk@faronear.org"
-
-RUN npm i -g --registry https://registry.npm.taobao.org @vue/cli@4
-RUN RUN cd / && echo -e "\n" | vue create --registry https://registry.npm.taobao.org -p dcloudio/uni-preset-vue vue-cli-uniapp
-RUN cd /vue-cli-uniapp && npm i -D --registry https://registry.npm.taobao.org sass@1.49.8 sass-loader@8.0.2
-
-EXPOSE 8080
-
-CMD cd /vue-cli-uniapp && npm run serve
-
-# docker build -t luk/name:tag .
-# docker run -d -p 8082:8080 -v /home/adot/pex-user-uniapp:/vue-cli-uniapp/src luk/vue-cli-uniapp
\ No newline at end of file