Skip to content

Commit

Permalink
v1.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
bitjerry committed Oct 30, 2022
1 parent faf48de commit 24ffd9e
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 12 deletions.
12 changes: 7 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@ ARG PYTHON_VERSION=3.10.8

#Install Tool
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
ca-certificates \
&& apt-get install -y --install-recommends \
software-properties-common \
wget \
xvfb \
gnupg
xvfb

#Intall Wine
COPY wine-init.sh /
Expand All @@ -25,7 +24,7 @@ RUN wget -nv -O- https://dl.winehq.org/wine-builds/winehq.key | APT_KEY_DONT_WAR
&& echo "deb https://dl.winehq.org/wine-builds/ubuntu/ $(grep VERSION_CODENAME= /etc/os-release | cut -d= -f2) main" >> /etc/apt/sources.list \
&& dpkg --add-architecture i386 \
&& apt-get update \
&& apt-get install -y --install-recommends winehq-stable \
&& apt-get install -y --no-install-recommends winehq-stable \
&& rm -rf /var/lib/apt/lists/* \
&& xvfb-run sh wine-init.sh

Expand All @@ -37,3 +36,6 @@ RUN wget https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VER
wineserver -w" \
&& rm python.exe

#Clear
RUN apt-get autoremove -y --purge software-properties-common wget \
&& apt-get clean -y
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Does not include the full Windows environment

If you have more requirements, please modify the `Dockerfile`

Read in other languages: English | [简体中文](./README.zh_cn.md)
Read in other languages: English | [简体中文](https://github.com/bitjerry/wine-python/blob/main/README.zh_cn.md)

---

Expand All @@ -38,4 +38,4 @@ xvfb-run sh -c "\
### Copyright

---
MIT © [bitjerry](./LICENSE)
MIT © [bitjerry](https://github.com/bitjerry/wine-python/blob/main/LICENSE)
13 changes: 8 additions & 5 deletions x64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@ ARG PYTHON_VERSION=3.10.8

#Install Tool
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
ca-certificates \
&& apt-get install -y --install-recommends \
software-properties-common \
wget \
xvfb \
gnupg
xvfb

#Intall Wine
COPY wine-init.sh /
Expand All @@ -25,7 +24,7 @@ RUN wget -nv -O- https://dl.winehq.org/wine-builds/winehq.key | APT_KEY_DONT_WAR
&& echo "deb https://dl.winehq.org/wine-builds/ubuntu/ $(grep VERSION_CODENAME= /etc/os-release | cut -d= -f2) main" >> /etc/apt/sources.list \
&& dpkg --add-architecture i386 \
&& apt-get update \
&& apt-get install -y --install-recommends winehq-stable \
&& apt-get install -y --no-install-recommends winehq-stable \
&& rm -rf /var/lib/apt/lists/* \
&& xvfb-run sh wine-init.sh

Expand All @@ -36,3 +35,7 @@ RUN wget https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VER
Include_doc=0 InstallAllUsers=1 PrependPath=1; \
wineserver -w" \
&& rm python.exe

#Clear
RUN apt-get autoremove -y --purge software-properties-common wget \
&& apt-get clean -y

0 comments on commit 24ffd9e

Please sign in to comment.