Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
hypha
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ots
hypha
Commits
220b7812
Unverified
Commit
220b7812
authored
6 years ago
by
Fredrik Jonsson
Committed by
GitHub
6 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #630 from OpenTechFund/update-psql-to-match-heroku
update the vagrant box and psql so that we are similar to heroku
parents
52d9c47c
2c4b8220
No related branches found
Branches containing commit
No related tags found
Tags containing commit
Loading
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Vagrantfile
+2
-2
2 additions, 2 deletions
Vagrantfile
vagrant/provision.sh
+5
-0
5 additions, 0 deletions
vagrant/provision.sh
with
7 additions
and
2 deletions
Vagrantfile
+
2
−
2
View file @
220b7812
...
...
@@ -21,8 +21,8 @@ Vagrant.configure(2) do |config|
# Every Vagrant development environment requires a box. You can search for
# boxes at https://atlas.hashicorp.com/search.
config
.
vm
.
box
=
"torchbox/wagtail-
jessie
64"
config
.
vm
.
box_version
=
"~>
2
.0"
config
.
vm
.
box
=
"torchbox/wagtail-
stretch
64"
config
.
vm
.
box_version
=
"~>
1.0
.0"
# Disable automatic box update checking. If you disable this, then
# boxes will only be checked for updates when the user runs
...
...
This diff is collapsed.
Click to expand it.
vagrant/provision.sh
+
5
−
0
View file @
220b7812
...
...
@@ -9,6 +9,11 @@ VIRTUALENV_DIR=/home/vagrant/.virtualenvs/$PROJECT_NAME
PYTHON
=
$VIRTUALENV_DIR
/bin/python
PIP
=
$VIRTUALENV_DIR
/bin/pip
# Upgrade to postgres 10
apt-get update
-y
apt-get remove
-y
--purge
postgresql-
*
apt-get
install
-y
postgresql-10 postgresql-client-10 postgresql-contrib-10
su - postgres
-c
"createuser -s vagrant"
# Create database
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment