Skip to content

Commit f3a8cfc

Browse files
committed
docker install
install setuptools for pkg_resources import in settings.py not specify latest mysql image to avoid mysql.plugin table error remove unecessary command
1 parent 006ac26 commit f3a8cfc

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

docker/docker-compose.yml-tmp

+1-3
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,9 @@ services:
2525
- pyscada
2626

2727
db:
28-
image: mysql:latest
28+
image: mysql
2929
container_name: mysql
3030
restart: always
31-
command: --default-authentication-plugin=mysql_native_password
32-
#build: mysql
3331
environment:
3432
MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
3533
MYSQL_DATABASE: 'PyScada_db'

docker/pyscada/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ WORKDIR /src/pyscada
2020

2121
RUN pip3 install gunicorn
2222
RUN pip3 install mysqlclient
23+
RUN pip3 install setuptools
2324
RUN pip3 install /src/pyscada/pyscada.zip
2425
RUN django-admin startproject PyScadaServer /src/pyscada/ --template /src/pyscada/project_template.zip
2526
RUN chmod +x /src/pyscada/pyscada

0 commit comments

Comments
 (0)