sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2025-06-12 09:00:40 +00:00
Code Issues Projects Releases Wiki Activity

All configuration via .env file. (This replaces the nopaque.env file)

Browse Source
This commit is contained in:
Patrick Jentsch
2020-06-09 12:46:08 +02:00
parent f32c6e9faa
commit 59003593b6
8 changed files with 89 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
daemon/Dockerfile
View File

@ -4,9 +4,9 @@ FROM python:3.6-slim-stretch
LABEL maintainer="inf_sfb1288@lists.uni-bielefeld.de"
ARG docker_gid=999
ARG gid=1000
ARG uid=1000
ARG DOCKER_GID
ARG GID
ARG UID
ENV LANG=C.UTF-8
@ -18,9 +18,9 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/*
RUN groupadd --gid ${docker_gid} --system docker \
&& groupadd --gid ${gid} --system nopaqued \
&& useradd --create-home --gid ${gid} --groups ${docker_gid} --no-log-init --system --uid ${uid} nopaqued
RUN groupadd --gid ${DOCKER_GID} --system docker \
&& groupadd --gid ${GID} --system nopaqued \
&& useradd --create-home --gid ${GID} --groups ${DOCKER_GID} --no-log-init --system --uid ${UID} nopaqued
USER nopaqued
WORKDIR /home/nopaqued

6
daemon/nopaqued.py.bak
View File

@ -340,10 +340,10 @@ def create_mail_notifications(notification_service):
data.job.user.email)
subject_template = '[nopaque] Status update for your Job/Corpora: {title}!'
subject_template_values_dict = {'title': data.job.title}
protocol = os.environ.get('NOPAQUE_PROTOCOL')
domain = os.environ.get('NOPAQUE_DOMAIN')
url = '{domain}/{jobs}/{id}'.format(domain=domain,
jobs='jobs',
id=data.job.id)
url = '{protocol}://{domain}/{jobs}/{id}'.format(
protocol=protocol, domain=domain, jobs='jobs', id=data.job.id)
body_template_values_dict = {'username': data.job.user.username,
'id': data.job.id,
'title': data.job.title,

6
daemon/tasks/notify.py
View File

@ -47,10 +47,10 @@ def __create_mail_notifications(notification_service):
data.job.user.email)
subject_template = '[nopaque] Status update for your Job/Corpora: {title}!'
subject_template_values_dict = {'title': data.job.title}
protocol = os.environ.get('NOPAQUE_PROTOCOL')
domain = os.environ.get('NOPAQUE_DOMAIN')
url = '{domain}/{jobs}/{id}'.format(domain=domain,
jobs='jobs',
id=data.job.id)
url = '{protocol}://{domain}/{jobs}/{id}'.format(
protocol=protocol, domain=domain, jobs='jobs', id=data.job.id)
body_template_values_dict = {'username': data.job.user.username,
'id': data.job.id,
'title': data.job.title,