Skip to content

Commit acea186

Browse files
authored
Merge pull request #121 from geerlingguy/119-update-deployments
Fixes #119: Build failing on Ruby on Rails deployments example
2 parents ea8ef61 + 6a0f390 commit acea186

File tree

5 files changed

+16
-14
lines changed

5 files changed

+16
-14
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ services: docker
44
env:
55
# Run each test playbook in a separate environment.
66
- playbook: deployments.yml
7-
distro: ubuntu1404
7+
distro: ubuntu1804
88
test_idempotence: false
99

1010
# TODO: Not easy to test in CI at this time.

deployments/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ Once the VM is built, you can visit `http://192.168.33.7/` (or whatever domain n
1414

1515
## Deploying application updates
1616

17-
The first 'production' release of this demo app is version `1.1.4`, which includes a basic interface for viewing and managing Articles. Subsequent releases can be deployed by incrementing the `app_version` in `playbooks/vars.yml`, then running the Ansible provisioner again with `vagrant provision`.
17+
The first 'production' release of this demo app is version `2.0.1`, which includes a basic interface for viewing and managing Articles. Subsequent releases can be deployed by incrementing the `app_version` in `playbooks/vars.yml`, then running the Ansible provisioner again with `vagrant provision`.
1818

1919
Some notable releases you could test:
2020

21-
- `1.1.4`: The first stable release. Very basic interface for performing CRUD operations on Articles, but this release is not idempotently-deployable due to some incorrect settings.
22-
- `1.2.0`: Major changes to the structure of the app, like the home page and general layout.
23-
- `1.2.2`: First 'production' version of the app, with user interface elements complete. First version of the app able to be deployed idempotently.
24-
- `1.3.0`: Major UX and design/layout improvements.
21+
- `1.1.4`: First stable release, but not idempotent when deployed.
22+
- TODO: This version is deprecated, but a similar version may be added soon.
23+
- `2.0.1`: First stable release with Article CRUD deployable on modern Ruby versions.
24+
- `2.1.0`: Includes a fancy new header with a linear gradient background. Marketing is happy.
2525

2626
## About the Author
2727

deployments/Vagrantfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# vi: set ft=ruby :
33

44
Vagrant.configure(2) do |config|
5-
config.vm.box = "geerlingguy/ubuntu1404"
5+
config.vm.box = "geerlingguy/ubuntu1804"
66
config.ssh.insert_key = false
77

88
config.vm.provider "virtualbox" do |v|

deployments/playbooks/provision.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@
1313

1414
tasks:
1515
- name: Install app dependencies.
16-
apt: "name={{ item }} state=present"
17-
with_items:
18-
- libsqlite3-dev
19-
- libreadline-dev
16+
apt:
17+
name:
18+
- libsqlite3-dev
19+
- libreadline-dev
20+
- tzdata
21+
state: present
2022

2123
- name: Ensure app directory exists and is writeable.
2224
file:

deployments/playbooks/vars.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
# Variables for our app.
3-
app_version: 1.1.4
3+
app_version: 2.0.1
44
app_directory: /opt/demo-rails-app
55
app_user: www-data
66
app_secrets:
@@ -18,8 +18,8 @@ passenger_ruby: /usr/local/bin/ruby
1818

1919
# Variables for Ruby installation.
2020
ruby_install_from_source: true
21-
ruby_download_url: http://cache.ruby-lang.org/pub/ruby/2.2/ruby-2.2.0.tar.gz
22-
ruby_version: 2.2.0
21+
ruby_download_url: https://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.0.tar.gz
22+
ruby_version: 2.6.0
2323

2424
# Variables for Node.js installation.
2525
nodejs_install_npm_user: root

0 commit comments

Comments
 (0)