Skip to content

Commit 76da89b

Browse files
authored
Merge pull request #461 from crystalstall/main
chore: fix some typos in comment
2 parents 718ee5c + 35cec3b commit 76da89b

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

ci/docker-build-push/entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ fi
3131

3232
if [ -z "${DOCKER_FILE}" ]
3333
then
34-
echo "No Dockerfile spectified. Using default file: Dockerfile"
34+
echo "No Dockerfile specified. Using default file: Dockerfile"
3535
DOCKER_FILE=Dockerfile
3636
fi
3737

docs/branching-strategy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ The following recipe shortly describes the typical steps that developers need to
1010

1111
![](https://hackernoon.com/hn-images/1*iHPPa72N11sBI_JSDEGxEA.png)
1212

13-
1. ***Create a branch***: When implementing a new feature, some improvement or a bugfix, a new branch should be created of the `main` branch. In order to preserve an organized git-repo, we agreed on follwing prefixes for branches:
13+
1. ***Create a branch***: When implementing a new feature, some improvement or a bugfix, a new branch should be created of the `main` branch. In order to preserve an organized git-repo, we agreed on following prefixes for branches:
1414

15-
- feature-\<branch-name\> -> adding/changeing functionality, whereas the branch-name should reflect the intention
15+
- feature-\<branch-name\> -> adding/changing functionality, whereas the branch-name should reflect the intention
1616
- bugfix-\<GitHub-issue\> -> fixing Github-issues
1717
- refactor-\<branch-name\> -> cleanup, maintanance, improving code quality, adding Unit tests
1818
- ci-\<branch-name\> -> anything related to continous integration

docs/continuous-integration-and-delivery.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ The second step takes the image and deploys it (create or update) to the configu
2828
![](https://user-images.githubusercontent.com/55081379/68245944-2a78db00-0018-11ea-8ebe-22c19d5ad096.PNG)
2929

3030
1. Dev pushes code to GitHub
31-
2. GitHub Actions (GHA) is triggerd by the „push“ event, clones the repo and runs the workflow for every container:
31+
2. GitHub Actions (GHA) is triggered by the „push“ event, clones the repo and runs the workflow for every container:
3232
* (a) Docker build
3333
* (b) Docker push (Docker image goes to DockerHub)
3434
* (c) Deploy to Kubernetes

0 commit comments

Comments
 (0)