oly
/
hackspace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated containerr versions

This commit is contained in:
Oliver Marks 2018-01-27 21:55:26 +00:00
parent 8eeecaae24
commit 95d45661b3
6 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
README.org
View File

@ -111,12 +111,26 @@ Setup / create new certs
letsencrypt certonly --renew --webroot -w /var/www/.well-known -d stage.maidstone-hackspace.org.uk
letsencrypt certonly --webroot -w /var/www/.well-known -d stage.maidstone-hackspace.org.uk
#+END_SRC
*** Postgres tips
Connect to the database inside container to run sql commands.
#+BEGIN_SRC bash
docker-compose -fstage.yml run --rm postgres psql -U postgres
#+END_SRC
*** Backups
Create a backup file with today's date
#+BEGIN_SRC bash
docker exec -t {CONTAINER_NAME} pg_dumpall -c -U postgres > dump_`date +%d-%m-%Y"_"%H_%M_%S`.sql
docker exec -t {CONTAINER_NAME} pg_dump -Fp -c -U postgresuser > dump_`date +%d-%m-%Y"_"%H_%M_%S`.sql
#+END_SRC
Import previously made backup
#+BEGIN_SRC bash
docker exec -t {CONTAINER_ID} pg_dumpall -c -U postgres > dump_`date +%d-%m-%Y"_"%H_%M_%S`.sql
cat dump_27-01-2018_14_26_09.sql | docker exec -i {CONTAINER_ID} psql -U postgres
#+END_SRC
docker exec -i {CONTINERID} pg_restore -U postgresuser < ./dump_27-01-2018_18_16_45.sql
docker exec miq_latest bash -lc 'pg_dump --format custom vmdb_production' > /tmp/pg_dump.pgdata
docker exec {CONTAINERID} bash -lc 'pg_dump --format custom -U postgresuser' > pg_dump.pgdata

2
compose/postgres/Dockerfile
View File

@ -1,4 +1,4 @@
FROM postgres:10
FROM postgres:9.6
# add backup scripts
ADD backup.sh /usr/local/bin/backup

4
config/settings/common.py
View File

@ -368,8 +368,8 @@ SOCIALACCOUNT_QUERY_EMAIL = True
AUTH_USER_MODEL = 'users.User'
LOGIN_REDIRECT_URL = 'users:redirect'
WIKI_ACCOUNT_HANDLING = False
WIKI_EDITOR = 'wiki.editors.martor.Martor'
WIKI_EDITOR_INCLUDE_JAVASCRIPT = False
# WIKI_EDITOR = 'wiki.editors.martor.Martor'
# WIKI_EDITOR_INCLUDE_JAVASCRIPT = False
EDITOR_INCLUDE_JAVASCRIPT = False

2
config/settings/local.py
View File

@ -17,7 +17,7 @@ from .common import * # noqa
# DEBUG
# ------------------------------------------------------------------------------
DEBUG = env.bool('DJANGO_DEBUG', default=True)
DEBUG = False
TEMPLATES[0]['OPTIONS']['debug'] = DEBUG
# SECRET CONFIGURATION

1
mhackspace/static/sass/components/_header.scss
View File

@ -14,6 +14,7 @@ html {
body {
max-width: 100%;
margin-bottom: 60px;
font-size: 14px;
}
.collapse.show.span-table {

4
requirements/base.txt
View File

@ -66,8 +66,8 @@ braintree==3.37.2
django-autofixture==0.12.1
git+https://github.com/olymk2/scaffold.git
git+git://github.com/olymk2/django-wiki.git
#git+git://github.com/django-wiki/django-wiki.git
#git+git://github.com/olymk2/django-wiki.git
git+git://github.com/django-wiki/django-wiki.git
djangorestframework==3.6.3
djangorestframework-jwt