...
 
Commits (37)
......@@ -20,6 +20,7 @@ data
postgres
mysql
tmp
var
# Installer logs
pip-log.txt
......
variables:
GIT_SUBMODULE_STRATEGY: recursive
build:
stage: build
image:
name: gcr.io/kaniko-project/executor:debug
entrypoint: [""]
tags:
- docker
script:
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --no-push
......@@ -30,8 +30,8 @@
[submodule "lib/cartridge"]
path = lib/cartridge
url = https://github.com/Ircam-Web/cartridge.git
branch-master = master
branch-dev = master
branch-master = vertigo-master
branch-dev = vertigo-master
[submodule "lib/django-ulysses"]
path = lib/django-ulysses
url = https://forge-2.ircam.fr/POW/django-ulysses.git
......
......@@ -3,6 +3,8 @@ FROM ircamweb/mezzo:latest
WORKDIR /srv
COPY lib /srv/lib
COPY bin/build/local/setup_lib.sh /srv
RUN bash setup_lib.sh
WORKDIR /srv/app
......@@ -11,7 +11,7 @@ log='/var/log/uwsgi/app.log'
# uwsgi params
port=8000
processes=4
processes=8
threads=2
autoreload=3
uid='www-data'
......
......@@ -57,7 +57,10 @@ except ImportError as e:
# Hosts/domain names that are valid for this site; required if DEBUG is False
# See https://docs.djangoproject.com/en/dev/ref/settings/#allowed-hosts
ALLOWED_HOSTS = ['www.starts.eu', 'vertigo.starts.eu', 'vertigo2017.ircam.fr',
'findpartner.starts.eu', 'wearsustain.starts.eu', 'starts01.ircam.fr']
'findpartner.starts.eu', 'wearsustain.starts.eu', 'starts01.ircam.fr',
'starts02.ircam.fr',]
if DEBUG:
ALLOWED_HOSTS = ['*']
# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
# although not all choices may be available on all operating systems.
......@@ -122,7 +125,7 @@ DATABASES = {
################
INSTALLED_APPS = [
"vertigo_components",
"vertigo_ircam_fr",
"vertigo_starts_eu",
"www_starts_eu",
......@@ -395,6 +398,12 @@ HOST_THEMES = [
('sandbox.vertigo.ircam.fr', 'vertigo_ircam_fr'),
('sandbox.vertigo.starts.eu', 'vertigo_starts_eu'),
('sandbox.www.starts.eu', 'www_starts_eu'),
('starts02.ircam.fr', 'www_starts_eu'),
]
EXTRA_THEMES_BUILD = [
('vertigo_components', 'npm run build')
]
##################
......@@ -467,3 +476,6 @@ try:
move(INSTALLED_APPS, "ulysses.system", len(INSTALLED_APPS))
except ValueError:
pass
MESSAGE_STORAGE = 'django.contrib.messages.storage.session.SessionStorage'
Subproject commit df28a36d664bc4ead94c40845327ec6fdbb773ff
Subproject commit b7e196ebb3104d7dd47e41936a128344b52d0803
......@@ -23,9 +23,9 @@ services:
var:
image: debian:stretch
volumes:
- /data/media:/srv/media
- ./var/media:/srv/media
- ./var/backup:/srv/backup
- /data/static:/srv/static
- ./var/static:/srv/static
- ./var/log/uwsgi:/var/log/uwsgi
- ./var/log/nginx:/var/log/nginx
- ./var/log/app:/var/log/app
......
version: '2'
services:
app:
build: .
build:
context: .
dockerfile: ./env/dev/Dockerfile
command: /bin/sh bin/app.sh --runserver
ports:
- "9022:8000"
env_file:
- 'env/dev.env'
var:
volumes:
- ./var/media:/srv/media
- ./var/static:/srv/static
volumes:
var:
\ No newline at end of file
FROM ircamweb/mezzo:latest-dev
WORKDIR /srv
COPY lib /srv/lib
RUN bash setup_lib.sh
WORKDIR /srv/app
version: '2'
services:
app:
build:
context: .
dockerfile: ./env/staging/Dockerfile
command: /bin/sh bin/app.sh
ports:
- "8022:8000"
- "8041:8000"
var:
volumes:
- ./var/media:/srv/media
- ./var/static:/srv/static
volumes:
var:
\ No newline at end of file
FROM ircamweb/mezzo:latest-dev
WORKDIR /srv
COPY lib /srv/lib
RUN bash setup_lib.sh
WORKDIR /srv/app
Subproject commit 40083db92f64d4feddeeb1511260c002dbf53f75
Subproject commit b0be8f3bd86579583b39948f29663aa1add00fe0
Subproject commit c4d3196c8a8164ba1561c541d8180e727b794b2d
Subproject commit 5b433110d5c88c25289880f0460abaab423368c8
Subproject commit c0aa091f0cf20f995641bdef2f13755060a73a7f
Subproject commit 44a36972ad420899fc2cee3b2499751851e93803