diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 13ebf11fe3de81a72626f116f55bdea9b0af5400..ee683a35b32072b038002b28856dcd9f9bec3c98 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: ubuntu:xenial +image: docker.isima.fr/vimazeno/pelican_perso cache: paths: diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 21d8c4cf78cd61909e2fdde9d52ee8afb9e7df93..0000000000000000000000000000000000000000 --- a/Dockerfile +++ /dev/null @@ -1,51 +0,0 @@ -FROM python:3.7-slim AS compile-image - -ARG DEBIAN_FRONTEND=noninteractive - -RUN { \ - echo krb5-config krb5-config/default_realm string 'LOCAL.ISIMA.FR'; \ - echo tzdata tzdata/Areas string 'Etc'; \ - echo tzdata tzdata/Zones/Etc string 'UTC'; \ - } | debconf-set-selections \ - && \ - apt-get update && apt-get install -y --no-install-recommends \ - build-essential \ - gcc \ - apt-utils \ - krb5-user \ - locales \ - rsync \ - && \ - locale-gen fr_FR \ - locale-gen fr_FR.UTF-8 \ - update-locale LANG=fr_FR.UTF-8 \ - . /etc/default/locale - -COPY requirements.txt . -RUN pip install --user -r requirements.txt - -FROM python:3.7-slim AS build-image -COPY --from=compile-image /root/.local /root/.local -COPY --from=compile-image /usr/bin /usr/bin -COPY --from=compile-image /usr/lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu -LABEL stage=builder - -ENV SRV_DIR=//srv -ENV WORKING_DIR=//srv/pelican -ENV PORT=8000 -ENV PATH=/root/.local/bin:$PATH - -ADD . $SRV_DIR -WORKDIR $WORKING_DIR -RUN mkdir output content cache -VOLUME ["$WORKING_DIR/"] - -# make python server in foreground -RUN sed -i 's/\$port &/\$port/g' $SRV_DIR/develop_server.sh - -RUN chmod +x $SRV_DIR/develop_server.sh - -EXPOSE $PORT - -ENTRYPOINT $SRV_DIR/develop_server.sh start $PORT - diff --git a/content/slides/cri/cri.html b/content/slides/cri/cri.html index e79f24482d18b12e3bb9ca7e9ee835cd15b2aeaf..7e6d837d0a19d23b7756cb573f187ce916f6097f 100644 --- a/content/slides/cri/cri.html +++ b/content/slides/cri/cri.html @@ -4,7 +4,7 @@ <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"> - <title>ZZ1</title> + <title>CRI INP / ISIMA / LIMOS</title> <link rel="stylesheet" href="../../node_modules/reveal.js/css/reveal.css"> <link rel="stylesheet" href="../../node_modules/reveal.js/css/theme/white.css"> @@ -26,7 +26,7 @@ <body> <div class="reveal"> <div class="slides"> - <section data-markdown="md/zz1.md" + <section data-markdown="md/cri.md" data-separator="^\n\n\n" data-separator-vertical="^\n\n" data-separator-notes="^Note:"