Skip to content

Commit 696e6d4

Browse files
RossBugginsNHSRossBugginsNHS
authored
Merge pull request #25 from NHSDigital/rossbugginsnhs/2024-07-03-import-hw-and-internal
Rossbugginsnhs/2024 07 03 import hw and internal
2 parents 6b782a8 + f80e8bf commit 696e6d4

File tree

26 files changed

+266
-151
lines changed

26 files changed

+266
-151
lines changed

‎.devcontainer/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
FROM --platform=linux/amd64 mcr.microsoft.com/devcontainers/jekyll:2-bullseye

‎.devcontainer/devcontainer.json‎

Lines changed: 50 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,21 @@
1-
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
2-
// README at: https://github.com/devcontainers/templates/tree/main/src/jekyll
31
{
4-
"name": "Jekyll",
5-
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6-
"image": "mcr.microsoft.com/devcontainers/jekyll:2-bullseye",
7-
// Features to add to the dev container. More info: https://containers.dev/features.
8-
// "features": {},
9-
// Use 'forwardPorts' to make a list of ports inside the container available locally.
10-
// "forwardPorts": [],
11-
// Uncomment the next line to run commands after the container is created.
12-
"postCreateCommand": "zsh scripts/devcontainer/postcreatecommand.sh",
13-
"postStartCommand": "zsh scripts/devcontainer/poststartcommand.sh",
14-
"forwardPorts": [4000],
15-
// Configure tool-specific properties.
2+
"build": {
3+
"dockerfile": "Dockerfile"
4+
},
165
"customizations": {
176
"codespaces": {
18-
"openFiles": ["README.md", ".github/SECURITY.md", "docs/index.md"]
7+
"openFiles": [
8+
"README.md",
9+
".github/SECURITY.md",
10+
"docs/index.md"
11+
]
1912
},
2013
"vscode": {
21-
// Set *default* container specific settings.json values on container create.
22-
"settings": {
23-
"autoOpenWorkspace.enableAutoOpenIfSingleWorkspace": true,
24-
"editor.formatOnSave": true,
25-
"files.insertFinalNewline": true,
26-
"[makefile]": {
27-
"editor.insertSpaces": false,
28-
"editor.detectIndentation": false
29-
}
30-
},
31-
// Add the IDs of extensions you want installed when the container is created.
3214
"extensions": [
33-
"zoma.vscode-auto-open-workspace",
3415
"alefragnani.bookmarks",
3516
"davidanson.vscode-markdownlint",
3617
"dbaeumer.vscode-eslint",
3718
"donjayamanne.githistory",
38-
"eamodio.gitlens",
3919
"editorconfig.editorconfig",
4020
"esbenp.prettier-vscode",
4121
"github.codespaces",
@@ -45,6 +25,8 @@
4525
"github.vscode-pull-request-github",
4626
"hediet.vscode-drawio",
4727
"johnpapa.vscode-peacock",
28+
"joshx.workspace-terminals",
29+
"maattdd.gitless",
4830
"mhutchie.git-graph",
4931
"ms-azuretools.vscode-docker",
5032
"ms-vscode-remote.remote-containers",
@@ -54,6 +36,7 @@
5436
"ms-vsliveshare.vsliveshare",
5537
"redhat.vscode-xml",
5638
"streetsidesoftware.code-spell-checker-british-english",
39+
"takumii.markdowntable",
5740
"tamasfe.even-better-toml",
5841
"tomoki1207.pdf",
5942
"vscode-icons-team.vscode-icons",
@@ -62,43 +45,59 @@
6245
"yzane.markdown-pdf",
6346
"yzhang.dictionary-completion",
6447
"yzhang.markdown-all-in-one",
65-
"joshx.workspace-terminals",
66-
"takumii.markdowntable"
67-
]
48+
"zoma.vscode-auto-open-workspace"
49+
],
50+
"settings": {
51+
"[makefile]": {
52+
"editor.detectIndentation": false,
53+
"editor.insertSpaces": false
54+
},
55+
"autoOpenWorkspace.enableAutoOpenIfSingleWorkspace": true,
56+
"editor.formatOnSave": true,
57+
"extensions.ignoreRecommendations": true,
58+
"files.insertFinalNewline": true
59+
}
6860
}
6961
},
7062
"features": {
7163
"ghcr.io/devcontainers/features/aws-cli:1": {
7264
"version": "latest"
7365
},
66+
"ghcr.io/devcontainers/features/common-utils:2": {
67+
"configureZshAsDefaultShell": true,
68+
"installOhMyZsh": true,
69+
"installOhMyZshConfig": true,
70+
"installZsh": true,
71+
"upgradePackages": true,
72+
"userGid": "automatic",
73+
"userUid": "automatic",
74+
"username": "automatic"
75+
},
7476
"ghcr.io/devcontainers/features/docker-in-docker:2": {
75-
"moby": true,
7677
"azureDnsAutoDetection": true,
78+
"dockerDashComposeVersion": "latest",
7779
"installDockerBuildx": true,
7880
"installDockerComposeSwitch": true,
79-
"version": "latest",
80-
"dockerDashComposeVersion": "latest"
81-
},
82-
"ghcr.io/devcontainers/features/node:1": {
83-
"nodeGypDependencies": true,
84-
"version": "lts",
85-
"nvmVersion": "latest"
81+
"moby": true,
82+
"version": "latest"
8683
},
8784
"ghcr.io/devcontainers/features/github-cli:1": {
8885
"installDirectlyFromGitHubRelease": true,
8986
"version": "latest"
9087
},
91-
"ghcr.io/devcontainers/features/common-utils:2": {
92-
"installZsh": true,
93-
"configureZshAsDefaultShell": true,
94-
"installOhMyZsh": true,
95-
"installOhMyZshConfig": true,
96-
"upgradePackages": true,
97-
"username": "automatic",
98-
"userUid": "automatic",
99-
"userGid": "automatic"
88+
"ghcr.io/devcontainers/features/node:1": {
89+
"nodeGypDependencies": true,
90+
"nvmVersion": "latest",
91+
"version": "lts"
10092
}
101-
}
102-
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
103-
// "remoteUser": "root"
93+
},
94+
"forwardPorts": [
95+
4000
96+
],
97+
"name": "Jekyll",
98+
"postCreateCommand": "zsh scripts/devcontainer/postcreatecommand.sh",
99+
"postStartCommand": "zsh scripts/devcontainer/poststartcommand.sh",
100+
"runArgs": [
101+
"--platform=linux/amd64"
102+
]
104103
}

‎.editorconfig‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,13 @@ indent_size = 4
1919

2020
[{Makefile,*.mk,go.mod,go.sum,*.go,.gitmodules}]
2121
indent_style = tab
22+
23+
# Ignore paths
24+
[Gemfile.lock]
25+
charset = unset
26+
end_of_line = unset
27+
insert_final_newline = unset
28+
trim_trailing_whitespace = unset
29+
indent_style = unset
30+
indent_size = unset
31+
generated_code = true

‎.github/actions/build-docs/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ runs:
1919
- name: Setup Ruby
2020
uses: ruby/[email protected]
2121
with:
22-
ruby-version: "3.1" # Not needed with a .ruby-version file
22+
ruby-version: "3.2" # Not needed with a .ruby-version file
2323
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
2424
cache-version: 0 # Increment this number if you need to re-download cached gems
2525
working-directory: "./docs"

‎.gitleaksignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
# SEE: https://github.com/gitleaks/gitleaks/blob/master/README.md#gitleaksignore
22

33
cd9c0efec38c5d63053dd865e5d4e207c0760d91:docs/guides/Perform_static_analysis.md:generic-api-key:37
4+
96096685ab3d6876671e2bc9a6ff4d48fc56e521:src/helloworld/helloworld.sln:ipv4:4
5+
4f4e8c15629b2cb09356a7fed4d72953590227ce:docs/Gemfile.lock:ipv4:4

‎.tool-versions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
terraform 1.7.0
44
pre-commit 3.6.0
55
nodejs 18.18.2
6-
gitleaks 8.15.3
6+
gitleaks 8.18.4
77

88
# ==============================================================================
99
# The section below is reserved for Docker image versions.

‎.vscode/settings.json‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
{
22
"autoOpenWorkspace.enableAutoOpenIfSingleWorkspace": true,
33
"files.exclude": {
4+
"**/.DS_Store": true,
45
"**/.git": true,
5-
"**/.svn": true,
66
"**/.hg": true,
7+
"**/.ruby-lsp": true,
8+
"**/.svn": true,
79
"**/CVS": true,
8-
"**/.DS_Store": true,
910
"**/Thumbs.db": true,
10-
"**/.ruby-lsp": true,
11-
"docs": true,
12-
".github": true,
1311
".devcontainer": true,
12+
".github": true,
1413
".vscode": false,
15-
"tests":true,
16-
"infrastructure":true,
17-
"scripts":true
14+
"docs": true,
15+
"infrastructure": true,
16+
"scripts": true,
17+
"terraform": true,
18+
"tests": true
1819
}
1920
}

‎CHANGELOG.md‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Changelog
2+
3+
All notable changes to this project will be documented in this file.
4+
5+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
6+
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
7+
8+
## [Unreleased]
9+
10+
### Added
11+
12+
### Changed
13+
14+
### Removed
15+
16+
### Deprecated
17+
18+
### Fixed
19+
20+
### Security
21+
22+
## [0.0.1] - 2024-06-20
23+
24+
### Added
25+
26+
- Initial release
27+
28+
[unreleased]: https://github.com/NHSDigital/nhs-notify-internal/compare/v0.0.1...HEAD
29+
[0.0.1]: https://github.com/NHSDigital/nhs-notify-internal/releases/tag/v0.0.1

‎docs/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ _site
22
.sass-cache
33
.jekyll-cache
44
.jekyll-metadata
5+
.bundle
56
vendor
7+
*Zone.Identifier
68
node_modules
79
_config.version.yml

‎docs/.vscode/launch.json‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
{
2-
"version": "0.2.0",
32
"configurations": [
43
{
4+
"console": "integratedTerminal",
55
"name": "Debug",
6+
"preLaunchTask": "stop-already-running",
67
"request": "launch",
7-
"runtimeArgs": ["debug"],
8+
"runtimeArgs": [
9+
"debug"
10+
],
811
"runtimeExecutable": "make",
9-
"skipFiles": ["<node_internals>/**"],
10-
"type": "node",
11-
"preLaunchTask": "stop-already-running",
12-
"console": "integratedTerminal"
12+
"skipFiles": [
13+
"<node_internals>/**"
14+
],
15+
"type": "node"
1316
}
14-
]
17+
],
18+
"version": "0.2.0"
1519
}

0 commit comments

Comments
 (0)