Commit ce1a1b09 authored by Jamie Tanna's avatar Jamie Tanna
Browse files

Reformat directory structure for Hugo

Note that we use pluralised content types i.e. `posts`.
parent a58e81dd
<blockquote>As part of an <a href="{% post_url 2018-03-06-chef-13-upgrades %}">upgrade from Chef 12 to Chef 13</a>, this is one of the posts in which I've been <a href="/posts/tags/chef-13-upgrade">detailing the issues I've encountered, and how I've resolved them </a>.</blockquote>
<blockquote>As part of an <a href="{{ ref . "2018-03-06-chef-13-upgrades" }}">upgrade from Chef 12 to Chef 13</a>, this is one of the posts in which I've been <a href="/posts/tags/chef-13-upgrade">detailing the issues I've encountered, and how I've resolved them </a>.</blockquote>
......@@ -9,7 +9,7 @@ canonical_url: http://www.impactnottingham.com/2014/07/intelligent-parenting/
---
> This article was [originally published](http://www.impactnottingham.com/2014/07/intelligent-parenting/) for [Impact Nottingham](http://www.impactnottingham.com).
![Intel Mimo](/assets/img/intel-mimo.jpg)
![Intel Mimo](/img/intel-mimo.jpg)
> Image Credit: Gizmag
......
......@@ -9,7 +9,7 @@ canonical_url: http://www.impactnottingham.com/2014/11/smart-is-the-new-black-li
---
> This article was [originally published](http://www.impactnottingham.com/2014/11/smart-is-the-new-black-lightbulbs-to-reflect-a-modern-age/) for [Impact Nottingham](http://www.impactnottingham.com).
![Smart Lightbulbs](/assets/img/smart-lightbulbs.png)
![Smart Lightbulbs](/img/smart-lightbulbs.png)
> Image courtesy of tech order via Flickr
......
......@@ -9,7 +9,7 @@ canonical_url: http://www.impactnottingham.com/2014/11/game-of-drones/
---
> This article was [originally published](http://www.impactnottingham.com/2014/11/game-of-drones/) for [Impact Nottingham](http://www.impactnottingham.com).
![Amazon Delivery](/assets/img/game-of-drones.jpg)
![Amazon Delivery](/img/game-of-drones.jpg)
> Image courtesy of Amazon Prime Air
......
......@@ -9,7 +9,7 @@ canonical_url: http://www.impactnottingham.com/2014/12/the-hour-of-code-whats-th
---
> This article was [originally published](http://www.impactnottingham.com/2014/12/the-hour-of-code-whats-the-worst-that-could-happen/) for [Impact Nottingham](http://www.impactnottingham.com).
![David Cameron during Hour of Code](/assets/img/hour-of-code.png)
![David Cameron during Hour of Code](/img/hour-of-code.png)
> Image courtesy of Number 10 via Flickr
......
......@@ -9,7 +9,7 @@ canonical_url: http://www.impactnottingham.com/2015/04/the-sony-hack/
---
> This article was [originally published](http://www.impactnottingham.com/2015/04/the-sony-hack/) for [Impact Nottingham](http://www.impactnottingham.com).
![Stereotypical hacking image](/assets/img/sony-hack.png)
![Stereotypical hacking image](/img/sony-hack.png)
> Image courtesy of Erwin Vindl via Flickr
......
......@@ -4,7 +4,7 @@ title: Continuous Delivery with Capistrano and GitLab Continuous Integration
description: How to get up and running with using GitLab CI and the Capistrano deploy tool
categories: guide
tags: capistrano deploy ci gitlab docker
image: /assets/img/vendor/gitlab-wordmark.png
image: /img/vendor/gitlab-wordmark.png
---
[Capistrano][capistrano-rb] is a deploy tool written in Ruby that I adopted last year, and started use with `jvt.me`, `hacknotts.com` and `inspirewit.com`.
......
......@@ -4,7 +4,7 @@ title: Why You Should Use GitLab.com
description: A discussion about the reasons that I would greatly recommend the GitLab.com platform for all your Git hosting, opposed to its competitors.
tags: gitlab opensource
categories: persuasive
image: /assets/img/vendor/gitlab-wordmark.png
image: /img/vendor/gitlab-wordmark.png
---
## tl;dr
......@@ -50,7 +50,7 @@ For instance, this is how I [distribute this site][jvtme-container-registry], an
Environments are a feature of the CI platform that help capture the different stages that an application must go through before reaching end user consumption, i.e. `dev`, `qa`, `prod`. This is something that is tracked within the [`.gitlab-ci.yml`][jvtme-ci-yaml] file, and then provides an easy way to see what environments are running what code, as well as exposing links to the environments themselves from the GitLab UI:
![The environments page on the repository for `jvt.me`](/assets/img/jvt.me-environments-21-03-17.png)
![The environments page on the repository for `jvt.me`](/img/jvt.me-environments-21-03-17.png)
GitLab also provides the ability to [check out your deployments locally][gitlab-docs-env-ref] - it does this by creating a Git `ref` which then tracks the commit in each environment. This makes it much less effort to determine which code is currently in which environment in a way that requires no manual (or even scripted) work by yourself, as it is handled through GitLab itself, and you can easily hook into it as the link describes.
......@@ -70,19 +70,19 @@ Last weekend, while setting up a new repo for [Hack24][hack24], [@anna_hax][anna
By having more of a delve, I found the following options:
![GitLab's approvals section](/assets/img/gitlab-approvals.png "GitLab's approvals section")
![GitLab's approvals section](/img/gitlab-approvals.png "GitLab's approvals section")
In order to make Merge Requests more robust, it can be useful to enforce the amount of approvals that must be given in order to allow a merge to occur. At the same time, there may be specific people in your project that you'd want to perform an approval for, and therefore you can call them out here, too.
<div class="divider"></div>
![GitLab's protected branches](/assets/img/gitlab-protected-branches.png "GitLab's protected branches")
![GitLab's protected branches](/img/gitlab-protected-branches.png "GitLab's protected branches")
Protected branches on GitLab provide a bit more control over the ability to push and merge - this means that you can limit the two options separately - i.e. you can ensure only your CI or service account can push directly to `develop` (for instance, when running workflows using something like [mvn-jgitflow][jgitflow]) but that any of the developers in your team can perform a merge _into_ `develop`. This extra control can be greatly useful when working on larger, distributed teams, and will make it possible to more tightly restrict access control to ensure that your project is managed correctly.
<div class="divider"></div>
![GitLab's push rules](/assets/img/gitlab-push-rules.png "GitLab's push rules")
![GitLab's push rules](/img/gitlab-push-rules.png "GitLab's push rules")
In addition, GitLab adds some extra controls over what can be pushed up - such as blocking any secrets, which is common to hear about, and I can see being a great thing to have enabled, for that one time you forget and then end up with a [$6000 AWS bill][aws-bill-6k].
......@@ -90,15 +90,15 @@ Additionally there can be enforcement on the commit messages, making sure that t
<div class="divider"></div>
![GitLab Merge Requests can be automerged when CI pipelines succeed](/assets/img/gitlab-merge-when-ci-succeeds.png "You can set GitLab to automerge a Merge Request when the CI Pipeline succeeds")
![GitLab Merge Requests can be automerged when CI pipelines succeed](/img/gitlab-merge-when-ci-succeeds.png "You can set GitLab to automerge a Merge Request when the CI Pipeline succeeds")
This is another really great feature - having a MR auto-merge when the CI job finishes. No longer do you have to keep checking back to see if i.e. Jenkins has succeeded for the MR. This is something that can be triggered and then you can just go and work on something else, freeing you up to focus on other things. This may not sound like a killer feature, but when you have relatively large build pipelines, this saves you from context switching back and forth to check if things have passed, so you can then merge them.
<div class="divider"></div>
![GitLab stops `WIP` Merge Requests from being merged until the `WIP `is removed from the title](/assets/img/gitlab-wip-merge.png "A WIP Merge Request cannot be merged until the `WIP` is removed from the title")
![GitLab stops `WIP` Merge Requests from being merged until the `WIP `is removed from the title](/img/gitlab-wip-merge.png "A WIP Merge Request cannot be merged until the `WIP` is removed from the title")
![GitLab stops `WIP` Merge Requests from being merged until the `WIP `is removed from the title](/assets/img/gitlab-wip-merge-2.png "A WIP Merge Request cannot be merged until the `WIP` is removed from the title")
![GitLab stops `WIP` Merge Requests from being merged until the `WIP `is removed from the title](/img/gitlab-wip-merge-2.png "A WIP Merge Request cannot be merged until the `WIP` is removed from the title")
This is something that I've found when working on teams using GitHub - in order to make it obvious that a Merge Request is a WIP that you don't want merged, it's best to set the title to i.e. `WIP: Add Why-GitLab article` and then add a `DO_NOT_MERGE` label. However, GitLab makes this even easier by detecting the `WIP` in the title, and disallowing merging until the title is updated. Although this seems like a minor thing, it means there's a little less overhead that you personally have, as you can't accidentally merge though the changes (if the CI passes, that is).
......
......@@ -4,7 +4,7 @@ title: Saving Repetition with Git Commit Templates
description: Speed up your commit message writing by providing a template for when you run `git commit`.
categories: blogumentation
tags: tools git workflow automation
image: /assets/img/vendor/git.png
image: /img/vendor/git.png
---
## Creating Your Commit Template
......@@ -81,7 +81,7 @@ cmt
Once hitting `<TAB>` in the file, I can then move around the file quickly, adding a message as follows:
<asciinema-player src="/assets/casts/commit-message-templates.json"></asciinema-player>
<asciinema-player src="/casts/commit-message-templates.json"></asciinema-player>
[beams-commit]: https://chris.beams.io/posts/git-commit/
[tpope-commit]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
......
......@@ -12,11 +12,11 @@ By combining these tools, it provides a really nice, easy to use interface, that
For instance:
![Glances running on a system under typical load](/assets/img/glances-load.png)
![Glances running on a system under typical load](/img/glances-load.png)
And then, when there is load on the system:
![Load on the system produces alerts and warnings](/assets/img/glances-load.png)
![Load on the system produces alerts and warnings](/img/glances-load.png)
Glances has the ability to display information about your containers, the actual system utilisation in terms of processes, and their I/O, CPU and Memory impacts, as well as general disk I/O by partition. Something I only noticed recently was the ability to see your system temperatures, as well as battery percentages. Finally, when your resource usage starts to get to certain levels, you will get warnings, such as the high CPU utilisation in the second image.
......
......@@ -4,7 +4,7 @@ title: Building Chef Cookbooks with GitLab (Part 1)
description: An introduction to how to build a cookbook using GitLab's Continuous Integration platform in conjunction with `kitchen-docker`.
categories: guide chef gitlab
tags: howto blogumentation gitlab chef test-kitchen docker gitlab-ci
image: /assets/img/vendor/chef-logo.png
image: /img/vendor/chef-logo.png
---
## Foreword
......
......@@ -4,7 +4,7 @@ title: Viewing your diff while writing your commits with git commit --verbose
description: Making it easier to write commit messages by having the diff in your editor.
categories: blogumentation
tags: git commit shell workflow
image: /assets/img/vendor/git.png
image: /img/vendor/git.png
---
I am a firm believer of the fact that Git history should be documentation for the reasoning behind _why_ the code is as it is. As such, I take care to make my commits follow [Chris Beams' commit guidelines][git-commit], which usually involves writing the commit while reading the diff of what's changed, so I don't forget anything.
......@@ -90,7 +90,7 @@ This means that I don't need any plugins, and can remain in my `$EDITOR`, as wel
To see this article in action, check out the asciicast:
<asciinema-player src="/assets/casts/git-commit-verbose.json"></asciinema-player>
<asciinema-player src="/casts/git-commit-verbose.json"></asciinema-player>
[vim-fugitive]: https://github.com/tpope/vim-fugitive
[git-commit]: https://chris.beams.io/posts/git-commit/
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment