bofh/fet2020
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

docker file service

Browse Source
This commit is contained in:
root (lxc-fetsite-04)
2020-10-05 21:58:24 +02:00
parent 4e8fcb596a
commit b38a0d69fa
3 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@@ -5,7 +5,7 @@ RUN python -m venv /opt/venv
ENV PATH="/opt/venv/bin:$PATH" ENV PATH="/opt/venv/bin:$PATH"
RUN apk add --no-cache --virtual .build-deps ca-certificates gcc linux-headers \ RUN apk add --no-cache --virtual .build-deps ca-certificates gcc linux-headers \
musl-dev jpeg-dev zlib-dev libffi-dev mysql \ musl-dev jpeg-dev zlib-dev libffi-dev mysql mariadb-dev \
&& pip install --upgrade pip && pip install --upgrade pip
COPY ./fet2020/requirements.txt /app/requirements.txt COPY ./fet2020/requirements.txt /app/requirements.txt
@@ -15,6 +15,7 @@ RUN pip install -r requirements.txt
FROM tiangolo/uwsgi-nginx:python3.8-alpine FROM tiangolo/uwsgi-nginx:python3.8-alpine
RUN apk add ghostscript-dev
COPY --from=builder /opt/venv /opt/venv COPY --from=builder /opt/venv /opt/venv
# Make sure we use the virtualenv: # Make sure we use the virtualenv:

19
docker-compose.yml
View File

@@ -11,27 +11,44 @@ services:
mysql: mysql:
image: jbergstroem/mariadb-alpine image: jbergstroem/mariadb-alpine
environment: environment:
# SKIP_INNODB: no SKIP_INNODB: "yes"
MYSQL_DATABASE: fet2020db MYSQL_DATABASE: fet2020db
MYSQL_USER: user MYSQL_USER: user
MYSQL_PASSWORD: hgu MYSQL_PASSWORD: hgu
MYSQL_COLLATION: utf8_general_ci
MYSQL_CHARSET: utf8
volumes:
- mysql-volume:/var/lib/mysql
etherpadsql: etherpadsql:
image: jbergstroem/mariadb-alpine image: jbergstroem/mariadb-alpine
environment: environment:
SKIP_INNODB: "yes"
MYSQL_DATABASE: etherpaddb MYSQL_DATABASE: etherpaddb
MYSQL_USER: user MYSQL_USER: user
MYSQL_PASSWORD: hgu MYSQL_PASSWORD: hgu
MYSQL_COLLATION: utf8_general_ci
MYSQL_CHARSET: utf8
volumes:
- ep-mysql-volume:/var/lib/mysql
etherpad: etherpad:
image: etherpad/etherpad image: etherpad/etherpad
environment: environment:
DB_TYPE: mysql DB_TYPE: mysql
DB_HOST: etherpadsql DB_HOST: etherpadsql
DB_PORT: 3306
DB_NAME: etherpaddb DB_NAME: etherpaddb
DB_USER: user DB_USER: user
DB_PASS: hgu DB_PASS: hgu
depends_on:
- etherpadsql
fet2020: fet2020:
image: fet2020django image: fet2020django
depends_on:
- mysql
ports: ports:
- "8001:8080" - "8001:8080"
volumes: volumes:
- ./fet2020:/app - ./fet2020:/app
volumes:
ep-mysql-volume:
mysql-volume:

9
fet2020/requirements.txt
View File

@@ -7,12 +7,11 @@ django-taggit==1.3.0
djangorestframework==3.12.1 djangorestframework==3.12.1
docutils==0.16 docutils==0.16
easy-thumbnails==2.7.0 easy-thumbnails==2.7.0
configparser
etherpad-lite==0.5 etherpad-lite==0.5
django-filter #mysql-python
ldap3
django-environ
mysql-python
ldap3==2.8.1 ldap3==2.8.1
#mysqlclient==2.0.1 mysqlclient==2.0.1
Pillow==7.2.0 Pillow==7.2.0
ghostscript==0.6 ghostscript==0.6