mirror of
https://github.com/evennia/evennia.git
synced 2026-03-16 21:06:30 +01:00
Merge branch 'dockerfile-python3' of https://github.com/amfl/evennia into amfl-dockerfile-python3
This commit is contained in:
commit
a844251973
2 changed files with 3 additions and 15 deletions
|
|
@ -27,13 +27,13 @@
|
|||
# as a base for creating your own custom containerized Evennia game. For more
|
||||
# info, see https://github.com/evennia/evennia/wiki/Running%20Evennia%20in%20Docker .
|
||||
#
|
||||
FROM alpine
|
||||
FROM python:3.7-alpine
|
||||
|
||||
LABEL maintainer="www.evennia.com"
|
||||
|
||||
# install compilation environment
|
||||
RUN apk update && apk add bash gcc jpeg-dev musl-dev procps py-pip \
|
||||
py-setuptools py2-openssl python python-dev zlib-dev gettext
|
||||
RUN apk update && apk add bash gcc jpeg-dev musl-dev procps \
|
||||
libffi-dev openssl-dev zlib-dev gettext
|
||||
|
||||
# add the files required for pip installation
|
||||
COPY ./setup.py /usr/src/evennia/
|
||||
|
|
|
|||
|
|
@ -1295,18 +1295,6 @@ def check_main_evennia_dependencies():
|
|||
if error:
|
||||
sys.exit()
|
||||
|
||||
# fix a common zope issue with a missing __init__ file
|
||||
zope_interface = importlib.import_module("zope.interface")
|
||||
expected_init_path = os.path.join(
|
||||
os.path.dirname(os.path.dirname(zope_interface.__file__)), "__init__.py")
|
||||
if not os.path.exists(expected_init_path):
|
||||
# add an empty missing __init__.py file to fix the problem
|
||||
with open(expected_init_path, 'w') as zope_init_file:
|
||||
zope_init_file.write("")
|
||||
print("Note: zope_interface.__init__.py not found. This is a known issue with that package."
|
||||
"\nEvennia auto-created it at {}.".format(
|
||||
expected_init_path))
|
||||
|
||||
# return True/False if error was reported or not
|
||||
return not error
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue