Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

一些优化及改进 #22

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/APP_PATH/
33 changes: 0 additions & 33 deletions Dockerfile

This file was deleted.

9 changes: 9 additions & 0 deletions desktop/BaiduNetDisk.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/usr/bin/env xdg-open
[Desktop Entry]
Version=1.0
Terminal=false
Type=Application
Name=百度网盘
Exec=bash '$PWD/start.sh' BaiduNetDisk
Icon=$PWD/icon/BaiduNetDisk.png
StartupWMClass=BaiduNetDisk
9 changes: 9 additions & 0 deletions desktop/Foxmail.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/usr/bin/env xdg-open
[Desktop Entry]
Version=1.0
Terminal=false
Type=Application
Name=Foxmail
Exec=bash '$PWD/start.sh' Foxmail
Icon=$PWD/icon/Foxmail.png
StartupWMClass=Foxmail
9 changes: 9 additions & 0 deletions desktop/QQ.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/usr/bin/env xdg-open
[Desktop Entry]
Version=1.0
Terminal=false
Type=Application
Name=QQ
Exec=bash '$PWD/start.sh' QQ
Icon=$PWD/icon/QQ.png
StartupWMClass=QQ
9 changes: 9 additions & 0 deletions desktop/TIM.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/usr/bin/env xdg-open
[Desktop Entry]
Version=1.0
Terminal=false
Type=Application
Name=TIM
Exec=bash '$PWD/start.sh' TIM
Icon=$PWD/icon/TIM.png
StartupWMClass=TIM
9 changes: 9 additions & 0 deletions desktop/ThunderSpeed.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/usr/bin/env xdg-open
[Desktop Entry]
Version=1.0
Terminal=false
Type=Application
Name=迅雷
Exec=bash '$PWD/start.sh' ThunderSpeed
Icon=$PWD/icon/ThunderSpeed.png
StartupWMClass=Thunder
Binary file added desktop/icon/BaiduNetDisk.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added desktop/icon/Foxmail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added desktop/icon/QQ.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added desktop/icon/TIM.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added desktop/icon/ThunderSpeed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions desktop/start.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash
docker start docker-wine
docker exec -i docker-wine /usr/bin/nohup /bin/bash &>/dev/null $1 &
47 changes: 47 additions & 0 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
#This Dockerfile uses the ubuntu image
#Author: Rokas_Urbelis
#Email : [email protected]
#Blog : https://blog.linux-code.com
FROM ubuntu:latest
MAINTAINER RokasUrbelis(Based on github deepin-wine-ubuntu project)


ARG IM=fcitx
ARG USER_NAME=Jason
ARG UID=1000
ARG GID=1000
ARG AUDIO_GID=63
ARG VIDEO_GID=39

COPY link.sh /root/
COPY deb/ /root/deb/

RUN groupadd -o -f -g $GID $USER_NAME \
&& groupmod -o -g $AUDIO_GID audio \
&& groupmod -o -g $VIDEO_GID video \
&& useradd --system --uid=$UID --gid=$GID --home /home/$USER_NAME --shell /bin/bash $USER_NAME -G audio,video

RUN cd /root \
&& rm -rf /var/lib/apt/lists/* \
&& apt-get update \
&& apt-get install wget git locales ttf-wqy-zenhei sudo -y \
&& apt-get clean && apt-get autoclean \
&& locale-gen en_US.UTF-8 zh_CN.UTF-8 zh_CN.GBK \
&& update-locale LANG=zh_CN.UTF-8 \
&& git clone --depth 1 https://github.com/wszqkzqk/deepin-wine-ubuntu.git \
&& mv -f deb/* /root/deepin-wine-ubuntu/ \
&& rm -rf deb \
&& yes|bash /root/deepin-wine-ubuntu/install.sh \
&& /bin/bash /root/link.sh \
&& rm -f /root/link.sh \
&& rm -rf /root/deepin-wine-ubuntu

ENV LC_CTYPE=zh_CN.UTF-8 \
XIM=$IM \
GTK_IM_MODULE=$IM \
QT_IM_MODULE=$IM \
XMODIFIERS="@im=$IM"

WORKDIR /home/$USER_NAME

CMD ["/bin/bash"]
File renamed without changes.
Binary file added docker/fonts/8514fix.fon
Binary file not shown.
Binary file added docker/fonts/8514fixe.fon
Binary file not shown.
Binary file added docker/fonts/8514fixg.fon
Binary file not shown.
Binary file added docker/fonts/8514fixr.fon
Binary file not shown.
Binary file added docker/fonts/8514fixt.fon
Binary file not shown.
Binary file added docker/fonts/8514oem.fon
Binary file not shown.
Binary file added docker/fonts/8514oeme.fon
Binary file not shown.
Binary file added docker/fonts/8514oemg.fon
Binary file not shown.
Binary file added docker/fonts/8514oemr.fon
Binary file not shown.
Binary file added docker/fonts/8514oemt.fon
Binary file not shown.
Binary file added docker/fonts/8514sys.fon
Binary file not shown.
Binary file added docker/fonts/8514syse.fon
Binary file not shown.
Binary file added docker/fonts/8514sysg.fon
Binary file not shown.
Binary file added docker/fonts/8514sysr.fon
Binary file not shown.
Binary file added docker/fonts/8514syst.fon
Binary file not shown.
Binary file added docker/fonts/85775.fon
Binary file not shown.
Binary file added docker/fonts/85855.fon
Binary file not shown.
Binary file added docker/fonts/85f1255.fon
Binary file not shown.
Binary file added docker/fonts/85f1256.fon
Binary file not shown.
Binary file added docker/fonts/85f1257.fon
Binary file not shown.
Binary file added docker/fonts/85f874.fon
Binary file not shown.
Binary file added docker/fonts/85s1255.fon
Binary file not shown.
Binary file added docker/fonts/85s1256.fon
Binary file not shown.
Binary file added docker/fonts/85s1257.fon
Binary file not shown.
Binary file added docker/fonts/85s874.fon
Binary file not shown.
Loading