ynerant
/
nk20
mirror of https://gitlab.crans.org/bde/nk20
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'beta' into 'master' 

Better CI

See merge request bde/nk20!105
This commit is contained in:
ynerant 2020-09-02 13:17:37 +02:00
parent 9f42ecb97a cf7101fc0f
commit d054d58661
5 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
.gitlab-ci.yml
View File

@ -1,33 +1,21 @@
stages:
- build_docker_image
- test
- quality-assurance
docker:
stage: build_docker_image
image:
name: gcr.io/kaniko-project/executor:debug
entrypoint: [""]
script:
- mkdir -p /kaniko/.docker
- echo "{\"auths\":{\"https://index.docker.io/v1/\":{\"auth\":\"$CI_BUILD_TOKEN\"}}}" > /kaniko/.docker/config.json
- /kaniko/executor --cache=true --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:latest --destination $CI_REGISTRY_IMAGE:debian
only:
- master
- beta
cache:
key: one-key-to-rule-them-all
paths:
- /cache/
# Debian Buster
py37-django22:
stage: test
image:
name: $CI_REGISTRY_IMAGE:debian
entrypoint: [""]
image: debian:buster-backports
before_script:
- apt-get update && apt-get install -y tox
- >
apt-get update &&
apt-get install --no-install-recommends -t buster-backports -y
python3-django python3-django-crispy-forms
python3-django-extensions python3-django-filters python3-django-polymorphic
python3-djangorestframework python3-django-cas-server python3-psycopg2 python3-pil
python3-babel python3-lockfile python3-pip python3-phonenumbers
python3-bs4 python3-setuptools tox
texlive-latex-base texlive-lang-french lmodern texlive-fonts-recommended
script: tox -e py37-django22
# Ubuntu 20.04
@ -39,21 +27,28 @@ py38-django22:
- ln -sf /usr/share/zoneinfo/Europe/Paris /etc/localtime && echo Europe/Paris > /etc/timezone
- >
apt-get update &&
apt-get install -y python3-django python3-django-crispy-forms
apt-get install --no-install-recommends -y
python3-django python3-django-crispy-forms
python3-django-extensions python3-django-filters python3-django-polymorphic
python3-djangorestframework python3-django-cas-server python3-psycopg2 python3-pil
python3-babel python3-lockfile python3-pip python3-phonenumbers ipython3
gettext libjs-bootstrap4 fonts-font-awesome tox &&
rm -rf /var/lib/apt/lists/*
python3-babel python3-lockfile python3-pip python3-phonenumbers
python3-bs4 python3-setuptools tox
texlive-latex-base texlive-lang-french lmodern texlive-fonts-recommended
script: tox -e py38-django22
linters:
stage: quality-assurance
image:
name: $CI_REGISTRY_IMAGE:debian
entrypoint: [""]
image: debian:buster-backports
before_script:
- apt-get update && apt-get install -y tox
- >
apt-get update &&
apt-get install --no-install-recommends -t buster-backports -y
python3-django python3-django-crispy-forms
python3-django-extensions python3-django-filters python3-django-polymorphic
python3-djangorestframework python3-django-cas-server python3-psycopg2 python3-pil
python3-babel python3-lockfile python3-pip python3-phonenumbers
python3-bs4 python3-setuptools tox
texlive-latex-extra texlive-lang-french lmodern texlive-fonts-recommended
script: tox -e linters
# Be nice to new contributors, but please use `tox`

2
Dockerfile
View File

@ -12,7 +12,7 @@ RUN apt-get update && \
python3-babel python3-lockfile python3-pip python3-phonenumbers ipython3 \
python3-bs4 python3-setuptools \
uwsgi uwsgi-plugin-python3 \
texlive-latex-extra texlive-lang-french lmodern texlive-fonts-recommended \
texlive-latex-base texlive-lang-french lmodern texlive-fonts-recommended \
gettext libjs-bootstrap4 fonts-font-awesome && \
rm -rf /var/lib/apt/lists/*

6
README.md
View File

@ -25,12 +25,14 @@ Sinon vous pouvez suivre les étapes ici.
```bash
$ sudo apt update
$ sudo apt install -t buster-backports -y python3-django python3-django-crispy-forms \
$ sudo apt install --no-install-recommends -t buster-backports -y \
python3-django python3-django-crispy-forms \
python3-django-extensions python3-django-filters python3-django-polymorphic \
python3-djangorestframework python3-django-cas-server python3-psycopg2 python3-pil \
python3-babel python3-lockfile python3-pip python3-phonenumbers ipython3 \
python3-bs4 python3-setuptools \
uwsgi uwsgi-plugin-python3 \
texlive-latex-extra texlive-fonts-extra texlive-lang-french \
texlive-latex-base texlive-lang-french lmodern texlive-fonts-recommended \
gettext libjs-bootstrap4 fonts-font-awesome \
nginx python3-venv git acl
```

7
ansible/roles/1-apt-basic/tasks/main.yml
View File

@ -8,6 +8,7 @@
apt:
update_cache: true
default_release: buster-backports
install_recommends: false
name:
# Common tools
- gettext
@ -20,6 +21,7 @@
# Python dependencies
- python3-babel
- python3-bs4
- python3-django
- python3-django-cas-server
- python3-django-crispy-forms
@ -32,12 +34,13 @@
- python3-pil
- python3-pip
- python3-psycopg2
- python3-setuptools
- python3-venv
# LaTeX (PDF generation)
- texlive-fonts-extra
- texlive-fonts-recommended
- texlive-lang-french
- texlive-latex-extra
- texlive-latex-base
# WSGI server
- uwsgi

6
apps/wei/templates/wei/weilist_sample.tex
View File

@ -6,8 +6,6 @@
\usepackage[margin=1.5cm]{geometry}
\usepackage{lmodern}
\usepackage{ltablex}
\usepackage{tabularx}
\begin{document}
\begin{center}
@ -25,7 +23,7 @@
\begin{center}
\footnotesize
\begin{tabularx}{\textwidth}{ccccccccc}
\begin{tabular}{ccccccccc}
\textbf{Nom} & \textbf{Prénom} & \textbf{Date de naissance} & \textbf{Genre} & \textbf{Section}
& \textbf{Bus} & \textbf{Équipe} & \textbf{Rôles} \\
{% for membership in memberships %}
@ -33,7 +31,7 @@
& {{ membership.registration.get_gender_display|safe }} & {{ membership.user.profile.section_generated|safe }} & {{ membership.bus.name|safe }}
& {% if membership.team %}{{ membership.team.name|safe }}{% else %}--{% endif %} & {{ membership.roles.first|safe }} \\
{% endfor %}
\end{tabularx}
\end{tabular}
\end{center}
\footnotesize