update lxqt

This commit is contained in:
施哲晨 2019-02-02 09:08:36 +08:00
parent 247c513519
commit fd7f2344fa
5 changed files with 12617 additions and 9 deletions

View File

@ -10,7 +10,7 @@ RUN if [ "x$localbuild" != "x" ]; then sed -i 's#http://archive.ubuntu.com/#http
ENV DEBIAN_FRONTEND=noninteractive
# What apps you would like to be installed
ARG APPS="vim-tiny net-tools zenity xz-utils firefox chromium-browser"
ARG APPS="vim-tiny net-tools zenity xz-utils firefox chromium-browser inetutils-ping lsof vim git"
ENV APPS=$APPS
ARG BUILD_DEPS="build-essential software-properties-common"
ENV BUILD_DEPS=$BUILD_DEPS
@ -61,19 +61,19 @@ RUN mkdir -p /usr/local/ffmpeg \
# builder
################################################################################
FROM node:8-alpine as builder
RUN npm config set registry https://registry.npm.taobao.org
# build frontend
COPY web /src/web
RUN cd /src/web \
&& yarn install \
&& yarn build
&& npm install \
&& npm build
################################################################################
# merge
################################################################################
FROM system
LABEL maintainer="fcwu.tw@gmail.com"
LABEL maintainer="sh081042@gmail.com"
COPY --from=builder /src/web/dist/ /usr/local/lib/web/frontend/
COPY image /

View File

@ -1,6 +1,6 @@
.PHONY: build run
REPO ?= dorowu/ubuntu-desktop-lxde-vnc
REPO ?= lxqt
TAG ?= latest
IMAGE ?= ubuntu:18.04
LOCALBUILD ?= tw

View File

@ -12,7 +12,7 @@ Quick Start
Run the docker container and access with port `6080`
```
docker run -p 6080:80 dorowu/ubuntu-desktop-lxde-vnc
docker run -p 6080:80 dorowu/ubuntu-desktop-lxde-vnc:bionic-lxqt
```
Browse http://127.0.0.1:6080/

12610
web/package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -15,7 +15,6 @@
"dependencies": {
"axios": "^0.18.0",
"vue": "^2.5.2",
"vue-material": "^1.0.0-beta-7",
"vue-router": "^3.0.1"
},
"devDependencies": {
@ -31,7 +30,6 @@
"babel-preset-stage-2": "^6.22.0",
"babel-register": "^6.22.0",
"chalk": "^2.0.1",
"chromedriver": "^2.27.2",
"copy-webpack-plugin": "^4.0.1",
"cross-spawn": "^5.0.1",
"css-loader": "^0.28.0",