Skip to content

Commit

Permalink
Revert "Docker (RefugeRestrooms#435)"
Browse files Browse the repository at this point in the history
This reverts commit 5876b6a.

Restores Vagrant files and configurations. Probably.
  • Loading branch information
DeeDeeG committed Jun 2, 2018
1 parent 72e3a69 commit 9936e99
Show file tree
Hide file tree
Showing 11 changed files with 305 additions and 81 deletions.
14 changes: 14 additions & 0 deletions .rake/vagrant.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
namespace :vagrant do
task :shell, [:command] do |_t, args|
fail "Usage rake vagrant:shell[command]" unless args[:command]

vagrant_path = 'PATH=/home/vagrant/.rbenv/shims:$PATH'

# We need to reset RUBYLIB in order to use gems in
# the context of the VM.
#
# Please see: https://github.com/mitchellh/vagrant/issues/6158#issuecomment-135796049
# for more info.
sh "unset RUBYLIB; vagrant ssh -c 'cd /vagrant/ && #{vagrant_path} bundle exec #{args[:command]}'"
end
end
11 changes: 7 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
language: ruby
services: docker
before_install:
- docker-compose build
cache: bundler
script:
- docker-compose run -e "RAILS_ENV=test" web rake db:test:prepare spec
- bundle exec rake db:setup RAILS_ENV=test
- bundle exec rake db:test:prepare
- bundle exec rake spec
- bundle exec rake cucumber
rvm:
- 2.3.1
48 changes: 22 additions & 26 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,35 @@
## Setting Up Development Environment

### 1 Fork and clone the repository.
https://help.github.com/articles/fork-a-repo/

### 2 Install Docker.
https://docs.docker.com/install/
### 2 Install Vagrant.
https://www.vagrantup.com/downloads.html

### 3 Build the Docker Container
Build the container
```
docker-compose build
```
### 3 Install VirtualBox
https://www.virtualbox.org/wiki/Downloads

### 4 Run the Docker Container
### 4 Capture the powers of vagrant
* In the repo dir: <code>vagrant up</code> (Safely ignore: 'dpkg-preconfigure: unable to re-open stdin: No such file or directory')
* If changes have been made since running vagrant up: <code>vagrant provision</code>

* Start the rails server. There are two ways to do this, depending on your familiarity running from within the vagrant shell:

You can now run and shutdown the app with:
```
docker-compose up
docker-compose down
```
1. A local `rake` wrapper that allows direct execution on the machine.
* Run `rake vagrant:shell[command]`<sup>1</sup>
* To start the rails server using the rake wrapper use: `rake vagrant:shell['rails s -b 0.0.0.0']`.
* Navigate to `localhost:3000`
2. Using `vagrant ssh` to gain access directly to the machine.
* To login to the machine: <code>vagrant ssh</code>
* `cd /vagrant/` to navigate to the refuge repo.
* To start the rails server use: `rails s -b 0.0.0.0`.
* Navigate to `localhost:3000`

It will be available at localhost:3000
[1] You can run any command locally using `rake vagrant:shell[]` and it will be executed in the repo root of the vagrant machine. You can try `rake vagrant:shell['pwd']` and see it will print the directory that the repo is in on the vagrant machine!

### 5 Run the Tests
```
docker-compose run -e "RAILS_ENV=test" web rake db:test:prepare spec
```
### 5 Optional tasks:
run <code>rake db:fix_accents</code> to clean up encoding problems in the safe2pee data. (Use <code>rake db:fix_accents[dry_run]</code> to preview the changes.)

### 6 Optional tasks:
To clean up encoding problems in the safe2pee data, run (Use `rake db:fix_accents[dry_run]` to preview the changes.):
```
docker-compose run rake db:fixaccents
```

### 7 Assets
### 6 Assets
* [Assets Repo](https://github.com/RefugeRestrooms/refuge_assets)

## Testing
Expand Down
19 changes: 0 additions & 19 deletions Dockerfile

This file was deleted.

3 changes: 3 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@ require File.expand_path('../config/application', __FILE__)

SaferstallsRails::Application.load_tasks

Dir.glob('.rake/*.rb').each do |f|
import f
end
54 changes: 54 additions & 0 deletions Vagrantfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :

# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
VAGRANTFILE_API_VERSION = "2"
BOXNAME = "refugerestrooms"

Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# Ubuntu 14.04 base box
config.vm.box = "ubuntu/trusty64"
config.vm.hostname = BOXNAME
#config.vm.box_download_checksum =

# Disable automatic box update checking. If you disable this, then
# boxes will only be checked for updates when the user runs
# `vagrant box outdated`. This is not recommended.
# config.vm.box_check_update = false

# Access the rails server at localhost:3000
config.vm.network "forwarded_port", guest: 3000, host: 3000

# Use this if you need to copy files via scp or something
# config.vm.network "private_network", ip: "192.168.33.10"

# If true, then any SSH connections made will enable agent forwarding.
# Default value: false
# config.ssh.forward_agent = true

# View virtualbox provider docs for more options
config.vm.provider "virtualbox" do |vb|
vb.name = BOXNAME
# Uncomment this if you need more than default of 512
vb.customize ["modifyvm", :id, "--memory", "1024"]
end

# If this gets bigger I can make it into a chef run
# mi-wood
config.vm.provision "shell", path: "setup/setup_vagrant.sh", privileged: false

# Enable provisioning with chef solo, specifying a cookbooks path, roles
# path, and data_bags path (all relative to this Vagrantfile), and adding
# some recipes and/or roles.
#
# config.vm.provision "chef_solo" do |chef|
# chef.cookbooks_path = "../my-recipes/cookbooks"
# chef.roles_path = "../my-recipes/roles"
# chef.data_bags_path = "../my-recipes/data_bags"
# chef.add_recipe "mysql"
# chef.add_role "web"
#
# # You may also specify custom JSON attributes:
# chef.json = { mysql_password: "foo" }
# end
end
18 changes: 7 additions & 11 deletions config/database.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
default: &default
development:
adapter: postgresql
encoding: unicode
host: db
username: postgres
password:
pool: 5

development:
<<: *default
database: bathrooms_development

pool: 5
host: localhost

test:
<<: *default
adapter: postgresql
encoding: unicode
database: bathrooms_test

pool: 5
host: localhost
14 changes: 0 additions & 14 deletions docker-compose.yml

This file was deleted.

7 changes: 0 additions & 7 deletions setup/entry

This file was deleted.

99 changes: 99 additions & 0 deletions setup/pg_hba.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
# PostgreSQL Client Authentication Configuration File
# ===================================================
#
# Refer to the "Client Authentication" section in the PostgreSQL
# documentation for a complete description of this file. A short
# synopsis follows.
#
# This file controls: which hosts are allowed to connect, how clients
# are authenticated, which PostgreSQL user names they can use, which
# databases they can access. Records take one of these forms:
#
# local DATABASE USER METHOD [OPTIONS]
# host DATABASE USER ADDRESS METHOD [OPTIONS]
# hostssl DATABASE USER ADDRESS METHOD [OPTIONS]
# hostnossl DATABASE USER ADDRESS METHOD [OPTIONS]
#
# (The uppercase items must be replaced by actual values.)
#
# The first field is the connection type: "local" is a Unix-domain
# socket, "host" is either a plain or SSL-encrypted TCP/IP socket,
# "hostssl" is an SSL-encrypted TCP/IP socket, and "hostnossl" is a
# plain TCP/IP socket.
#
# DATABASE can be "all", "sameuser", "samerole", "replication", a
# database name, or a comma-separated list thereof. The "all"
# keyword does not match "replication". Access to replication
# must be enabled in a separate record (see example below).
#
# USER can be "all", a user name, a group name prefixed with "+", or a
# comma-separated list thereof. In both the DATABASE and USER fields
# you can also write a file name prefixed with "@" to include names
# from a separate file.
#
# ADDRESS specifies the set of hosts the record matches. It can be a
# host name, or it is made up of an IP address and a CIDR mask that is
# an integer (between 0 and 32 (IPv4) or 128 (IPv6) inclusive) that
# specifies the number of significant bits in the mask. A host name
# that starts with a dot (.) matches a suffix of the actual host name.
# Alternatively, you can write an IP address and netmask in separate
# columns to specify the set of hosts. Instead of a CIDR-address, you
# can write "samehost" to match any of the server's own IP addresses,
# or "samenet" to match any address in any subnet that the server is
# directly connected to.
#
# METHOD can be "trust", "reject", "md5", "password", "gss", "sspi",
# "krb5", "ident", "peer", "pam", "ldap", "radius" or "cert". Note that
# "password" sends passwords in clear text; "md5" is preferred since
# it sends encrypted passwords.
#
# OPTIONS are a set of options for the authentication in the format
# NAME=VALUE. The available options depend on the different
# authentication methods -- refer to the "Client Authentication"
# section in the documentation for a list of which options are
# available for which authentication methods.
#
# Database and user names containing spaces, commas, quotes and other
# special characters must be quoted. Quoting one of the keywords
# "all", "sameuser", "samerole" or "replication" makes the name lose
# its special character, and just match a database or username with
# that name.
#
# This file is read on server startup and when the postmaster receives
# a SIGHUP signal. If you edit the file on a running system, you have
# to SIGHUP the postmaster for the changes to take effect. You can
# use "pg_ctl reload" to do that.

# Put your actual configuration here
# ----------------------------------
#
# If you want to allow non-local connections, you need to add more
# "host" records. In that case you will also need to make PostgreSQL
# listen on a non-local interface via the listen_addresses
# configuration parameter, or via the -i or -h command line switches.




# DO NOT DISABLE!
# If you change this first entry you will need to make sure that the
# database superuser can access the database using some other method.
# Noninteractive access to all databases is required during automatic
# maintenance (custom daily cronjobs, replication, and similar tasks).
#
# Database administrative login by Unix domain socket
local all postgres peer

# TYPE DATABASE USER ADDRESS METHOD

# "local" is for Unix domain socket connections only
local all all trust
# IPv4 local connections:
host all all 127.0.0.1/32 trust
# IPv6 local connections:
host all all ::1/128 trust
# Allow replication connections from localhost, by a user with the
# replication privilege.
#local replication postgres peer
#host replication postgres 127.0.0.1/32 md5
#host replication postgres ::1/128 md5
Loading

0 comments on commit 9936e99

Please sign in to comment.