Skip to content
This repository has been archived by the owner on Mar 25, 2021. It is now read-only.

Fir 167 update readme with master key instructions #39

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fir 167 update readme with master key instructions #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91ebd55
FIR-167 update readme with instructions for setting rails masterkey
annaliisamoter Feb 17, 2021
0ebaca1
FIR-167 remove unnecessary command from Dockerfile
annaliisamoter Feb 17, 2021
6d54092
specify the right vault FIR-167
annaliisamoter Feb 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,6 @@ public/assets
release.sh
coverage
.ruby-version

# Ignore master key for decrypting credentials and more.
/config/master.key
2 changes: 0 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ COPY Gemfile.lock $WORK_DIR/Gemfile.lock
RUN gem install bundler -v '1.17.3'
RUN cd $WORK_DIR && bundle install


RUN apt-get update && \
apt-get install -y apt-transport-https && \
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
Expand All @@ -28,7 +27,6 @@ RUN apt-get update && \
COPY . $WORK_DIR

WORKDIR $WORK_DIR
RUN bundle exec rails db:environment:set RAILS_ENV=production
EXPOSE 80

ENTRYPOINT ["bundle", "exec"]
Expand Down
24 changes: 16 additions & 8 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,29 @@ Heaven currently supports [Capistrano][15], [Fabric][10], and [Heroku][22] deplo

To make any changes to Heaven, you'll need Docker installed locally.

First, make you changes to Heaven and open a pull request.
Make sure your CircleCI build is green.
Build the new docker image locally in your branch to make sure it works:
`Docker build .`
Merge your PR to master.
### Adding rails masterkey

With the change to rails 5, in order to successfully build a docker image, you will need to add a rails masterkey locally. This will only need to be done once.

1. Grab the Heaven rails masterkey from our shared 1password Infra vault
2. run `EDITOR="vim" bin/rails credentials:edit` to edit the master key file and paste in the masterkey you copied from the vault.

Then:
push your local changes to Docker registry using the release script:
### Next steps for making changes

1. make your changes to Heaven and open a pull request.
2. Make sure your CircleCI build is green.
3. Build the new docker image locally in your branch to make sure it works:
`Docker build .`
4. Merge your PR to master.
5. Checkout master and pull.
6. Push your changes to Docker registry using the release script:

```(sh)
cd heaven
script/release
```

Then deploy the latest Docker image to our environment:
7. Then deploy the latest Docker image to our environment:

```(sh)
cd aws-deploy-brainy
Expand Down