Commit 4afaf365 authored by Philippe Pepiot's avatar Philippe Pepiot

Change the instance name to "intranet".

Otherwise, mails sent by cubicweb-blog have a subject prefix "[instance]".
We want "[intranet]" here.

Use CW_INSTANCE_NAME build arg from docker-cubicweb for this.
parent de2b7b1d9907
ARG CW_INSTANCE_NAME=intranet
FROM hub.extranet.logilab.fr/cubicweb/cubicweb:3.26-onbuild
USER root
RUN pip install -r /src/docker/requirements.txt
RUN cp /src/docker/pyramid.ini.j2 /pyramid.ini.j2
USER cubicweb
ENV WITH_TRUSTEDAUTH=false
......@@ -11,10 +11,10 @@ can edit the code locally and run it in the container.
Some useful commands::
* ``cubicweb-ctl db-create -a instance`` will create and initialize the
* ``cubicweb-ctl db-create -a intranet`` will create and initialize the
database
* ``cubicweb-ctl pyramid -D -l info instance`` will start the instance on
* ``cubicweb-ctl pyramid -D -l info intranet`` will start the instance on
http://localhost:8080
Deploying on kubernetes
......@@ -28,7 +28,7 @@ To create the initial database from an existing empty database::
--env CW_DB_PASSWORD=pass \
--env CW_DB_NAME=intranet \
--image=hub.extranet.logilab.fr/logilab/intranet --command -- \
cubicweb-ctl db-create --automatic --create-db=n instance
cubicweb-ctl db-create --automatic --create-db=n intranet
kubectl delete deployment intranet-dbcreate
......
......@@ -7,7 +7,7 @@ data:
default.conf: |
server {
listen 8000 default_server;
root /etc/cubicweb.d/instance/data;
root /etc/cubicweb.d/intranet/data;
rewrite ^/intra/(.*) /$1 last;
location / {
......@@ -23,7 +23,7 @@ data:
}
location /data {
alias /etc/cubicweb.d/instance/data;
alias /etc/cubicweb.d/intranet/data;
expires 30d;
}
}
......@@ -59,7 +59,7 @@ spec:
name: intranet-env
volumeMounts:
- name: static
mountPath: /etc/cubicweb.d/instance/data
mountPath: /etc/cubicweb.d/intranet/data
resources:
requests:
cpu: 500m
......@@ -74,7 +74,7 @@ spec:
mountPath: /etc/nginx/conf.d/default.conf
subPath: default.conf
- name: static
mountPath: /etc/cubicweb.d/instance/data
mountPath: /etc/cubicweb.d/intranet/data
resources:
requests:
cpu: 100m
......@@ -116,7 +116,7 @@ spec:
envFrom:
- secretRef:
name: intranet-env
command: ["cubicweb-ctl", "scheduler", "instance"]
command: ["cubicweb-ctl", "scheduler", "intranet"]
resources:
requests:
cpu: 100m
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment