Skip to content

Commit 67b46be

Browse files
committed
Fix typos
Signed-off-by: Viktor Szépe <[email protected]>
1 parent 456a8b7 commit 67b46be

File tree

32 files changed

+63
-63
lines changed

32 files changed

+63
-63
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,13 +215,13 @@ to `Dockerfile.reversed`
215215
### New Features
216216

217217
- Container probe feature to use one of the compose services to test/probe the target container (`--container-probe-compose-svc` flag and `container.probe` continue-after mode)
218-
- Ability to override the container image name and/or tag when targetting a compose service (`--target-compose-svc-image` flag)
218+
- Ability to override the container image name and/or tag when targeting a compose service (`--target-compose-svc-image` flag)
219219
- Ability to wait before executing the HTTP probes (`--http-probe-start-wait` flag)
220220
- Ability to wait before starting each compose service (`--compose-svc-start-wait` flag)
221221
- Basic FastCGI protocol support in HTTP probes (docs TBD)
222222
- New `registry` command and a basic `pull` subcommand
223223
- `--include-new` build flag to keep new files created by target during dynamic analysis
224-
- Supprot for stored global param in `slim.config.json`
224+
- Support for stored global param in `slim.config.json`
225225

226226

227227
### Improvements

README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ archlinux latest ... ... 467MB
7676

7777
## Community
7878

79-
Feel free to join any of these channels or just open a new [`Github issue`](https://github.com/slimtoolkit/slim/issues) if you want to chat or if you need help.
79+
Feel free to join any of these channels or just open a new [`GitHub issue`](https://github.com/slimtoolkit/slim/issues) if you want to chat or if you need help.
8080

8181
* [`CNCF Slack channel`](https://cloud-native.slack.com/archives/C059QP1RH1S)
8282
* [`Discord server`](https://discord.gg/9tDyxYS)
@@ -874,9 +874,9 @@ pipeline {
874874
}
875875
```
876876

877-
### Integrating Slimtoolkit in Github Actions
878-
#### Github Action
879-
Integrating SlimToolkit in Github Actions in your CI/CD workflow involves using the [Docker-Slim Github Action](https://github.com/marketplace/actions/docker-slim-github-action), this Action(snippet below) minifies a target docker image--IMAGE_NAME:latest in your workflow, making it smaller and adjusting the new slimmed image as IMAGE_NAME:slim.
877+
### Integrating Slimtoolkit in GitHub Actions
878+
#### GitHub Action
879+
Integrating SlimToolkit in GitHub Actions in your CI/CD workflow involves using the [Docker-Slim GitHub Action](https://github.com/marketplace/actions/docker-slim-github-action), this Action(snippet below) minifies a target docker image--IMAGE_NAME:latest in your workflow, making it smaller and adjusting the new slimmed image as IMAGE_NAME:slim.
880880
```
881881
# Slim it!
882882
- uses: kitabisa/docker-slim-action@v1
@@ -886,8 +886,8 @@ Integrating SlimToolkit in Github Actions in your CI/CD workflow involves using
886886
target: IMAGE_NAME:latest
887887
tag: "slim"
888888
```
889-
#### Github Actions Slim Workflow
890-
You can integrate the Docker-Slim Github Action in your workflow by inserting the Action after a [Docker Build/Push Github Action](https://github.com/docker/build-push-action), before [Docker Login Github Action](https://github.com/docker/login-action) and docker tag/push commands, a customized example workflow is highlighted below. Note that the environment variable tag--{{github.run_number}} in the workflow represents a unique incremental number allocated by Github Actions each time your workflow runs.
889+
#### GitHub Actions Slim Workflow
890+
You can integrate the Docker-Slim GitHub Action in your workflow by inserting the Action after a [Docker Build/Push GitHub Action](https://github.com/docker/build-push-action), before [Docker Login GitHub Action](https://github.com/docker/login-action) and docker tag/push commands, a customized example workflow is highlighted below. Note that the environment variable tag--{{github.run_number}} in the workflow represents a unique incremental number allocated by GitHub Actions each time your workflow runs.
891891
```
892892
# Build the Docker image first
893893
- uses: docker/build-push-action@v4
@@ -915,9 +915,9 @@ You can integrate the Docker-Slim Github Action in your workflow by inserting th
915915
docker push ${{ secrets.DOCKERHUB_USERNAME }}/IMAGE_NAME:slim-{{github.run_number}}
916916
```
917917
The workflow above indicates four steps:
918-
- A [Docker Build/Push Github Action](https://github.com/docker/build-push-action) for building a docker image with the image name/tag--IMAGE_NAME:{{github.run_number}}, you should give replace IMAGE_NAME with your desired image name. Note that this Action must have a false option to push the built image--given that you need the image slimmed/minified before pushing it to a container registry.
919-
- A Docker-Slim Github Action which minifies the target image--IMAGE_NAME:{{github.run_number}}, this Action has the "slim-{{github.run_number}}" tag and adds this tag to the slimmed/minified docker image such that the image name/tag becomes IMAGE_NAME:slim-{{github.run_number}}.
920-
- A Docker Login Github Action which logs into your DockerHub container regristry account, you should store your DockerHub username and personal access token as secrets in the github repository meant for the workflow. Suppose your container registry is not DockerHub, you can check the [Docker Login Github Action documentation](https://github.com/docker/login-action) for the use case of logging into your desired container registry.
918+
- A [Docker Build/Push GitHub Action](https://github.com/docker/build-push-action) for building a docker image with the image name/tag--IMAGE_NAME:{{github.run_number}}, you should give replace IMAGE_NAME with your desired image name. Note that this Action must have a false option to push the built image--given that you need the image slimmed/minified before pushing it to a container registry.
919+
- A Docker-Slim GitHub Action which minifies the target image--IMAGE_NAME:{{github.run_number}}, this Action has the "slim-{{github.run_number}}" tag and adds this tag to the slimmed/minified docker image such that the image name/tag becomes IMAGE_NAME:slim-{{github.run_number}}.
920+
- A Docker Login GitHub Action which logs into your DockerHub container regristry account, you should store your DockerHub username and personal access token as secrets in the github repository meant for the workflow. Suppose your container registry is not DockerHub, you can check the [Docker Login GitHub Action documentation](https://github.com/docker/login-action) for the use case of logging into your desired container registry.
921921
- A docker tag command for naming/tagging the slimmed image with your DockerHub account remote repository name which could be the same name(IMAGE_NAME) as the slimmed image; A docker push command to push the slimmed image to your Dockerhub account remote repository.
922922

923923

@@ -1011,7 +1011,7 @@ Commands in `probeCmds.json`:
10111011
"resource": "/submit"
10121012
},
10131013
{
1014-
"procotol": "http",
1014+
"protocol": "http",
10151015
"resource": "/api/call?arg=one"
10161016
},
10171017
{
@@ -1415,7 +1415,7 @@ DockerSlim was a `Docker Global Hack Day` \#`dockerhackday` project. It barely w
14151415

14161416
![DHD3](assets/images/dhd/docker_global_hackday3_red.png)
14171417

1418-
Since then it's been improved and it works pretty well for its core use cases. It can be better though. That's why the project needs your help! You don't need to know much about the container internals, container runtimes and you don't need to know anything about Go. You can contribute in many different ways. For example, use Slim on your images and open Github issues documenting your experience even if it worked just fine :-)
1418+
Since then it's been improved and it works pretty well for its core use cases. It can be better though. That's why the project needs your help! You don't need to know much about the container internals, container runtimes and you don't need to know anything about Go. You can contribute in many different ways. For example, use Slim on your images and open GitHub issues documenting your experience even if it worked just fine :-)
14191419

14201420
## LICENSE
14211421

ROADMAP.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# High Level Project Roadmap
22

3-
This is a high level roadmap that identies the current areas of focus. Note that it's not a detailed list of every possible enhancement.
3+
This is a high level roadmap that identities the current areas of focus. Note that it's not a detailed list of every possible enhancement.
44

55
* Community
6-
* Collaborate with other CNCF projects to achieve mutually benefitial outcomes
6+
* Collaborate with other CNCF projects to achieve mutually beneficial outcomes
77
* Talks, outreach, community training
88
* Engage with the community to increase project contributions
99

@@ -23,7 +23,7 @@ This is a high level roadmap that identies the current areas of focus. Note that
2323
* Build/Optimize engine
2424
* Error and logging enhancements to improve debuggability
2525
* Improved build flag documentation with examples
26-
* Improved CI/build tool integration documentation (including Github Actions)
26+
* Improved CI/build tool integration documentation (including GitHub Actions)
2727

2828
* Integrations
2929
* Consign integrations for `xray` (reporting) and `build` (signing)

pkg/app/master/command/build/flags.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ const (
148148
FlagCBONetwork = "cbo-network"
149149
FlagCBOCacheFrom = "cbo-cache-from"
150150

151-
//Experimenal flags
151+
//Experimental flags
152152
FlagObfuscateMetadata = "obfuscate-metadata"
153153
)
154154

@@ -163,7 +163,7 @@ const (
163163

164164
FlagPathPermsUsage = "Set path permissions in optimized image"
165165
FlagPathPermsFileUsage = "File with path permissions to set"
166-
FlagPreservePathUsage = "Keep path from orignal image in its initial state (changes to the selected container image files when it runs will be discarded)"
166+
FlagPreservePathUsage = "Keep path from original image in its initial state (changes to the selected container image files when it runs will be discarded)"
167167
FlagPreservePathFileUsage = "File with paths to keep from original image in their original state (changes to the selected container image files when it runs will be discarded)"
168168
FlagIncludePathUsage = "Keep path from original image"
169169
FlagIncludePathFileUsage = "File with paths to keep from original image"

pkg/app/master/command/build/kubernetes.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ func (h *kubeHandler) Handle(
210210
opts.CustomImageTag,
211211
opts.AdditionalTags,
212212
opts.CBOpts,
213-
nil, // TODO: overrrides
213+
nil, // TODO: overrides
214214
nil, // TODO: imageOverrideSelectors,
215215
nil, // TODO: instructions,
216216
opts.DoDeleteFatImage,

pkg/app/master/command/run/handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ func OnCommand(
147147
for {
148148
select {
149149
case evt := <-containerEventCh:
150-
logger.Tracef("Exection Event: name=%s", evt.Event)
150+
logger.Tracef("Execution Event: name=%s", evt.Event)
151151
switch evt.Event {
152152
case container.XEExitedCrash:
153153
xc.Out.Info("target.container.event",

pkg/app/master/command/xray/cli.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ func parseDetectUTF8(raw string) (*dockerimage.UTF8Detector, error) {
585585
return nil, fmt.Errorf("malformed find utf8: %s", raw)
586586
}
587587
outTarget = parts[0]
588-
_ = parts[1] // TODO implemement path pattern matcher
588+
_ = parts[1] // TODO implement path pattern matcher
589589
maxSizeBytes := parts[2]
590590
var err error
591591
detector.MaxSizeBytes, err = strconv.Atoi(maxSizeBytes)
@@ -598,8 +598,8 @@ func parseDetectUTF8(raw string) (*dockerimage.UTF8Detector, error) {
598598
return nil, fmt.Errorf("malformed find utf8: %s", raw)
599599
}
600600
outTarget = parts[0]
601-
_ = parts[1] // TODO implemement path pattern matcher
602-
_ = parts[2] // TODO implemement data regex matcher
601+
_ = parts[1] // TODO implement path pattern matcher
602+
_ = parts[2] // TODO implement data regex matcher
603603
maxSizeBytes := parts[3]
604604
var err error
605605
detector.MaxSizeBytes, err = strconv.Atoi(maxSizeBytes)

pkg/app/master/kubernetes/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ func (c *Client) Delete(ctx context.Context, info *resource.Info) error {
9595
}
9696

9797
// ResourceBuilderFunc is a helper function to avoid
98-
// passing KuberneteOptions through unrelated code.
98+
// passing KubernetesOptions through unrelated code.
9999
type ResourceBuilderFunc func() *resource.Builder
100100

101101
func NewResourceBuilder(kubeOpts config.KubernetesOptions) *resource.Builder {

pkg/app/master/probe/http/custom_probe.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ func (p *CustomProbe) Start() {
371371
if port == defaultFastCGIPortStr && cmd.FastCGI == nil {
372372
log.Debugf("HTTP probe - FastCGI default port (%s) used, setting up HTTP probe FastCGI wrapper defaults", port)
373373

374-
// Typicall the entrypoint into a PHP app.
374+
// Typically the entrypoint into a PHP app.
375375
if cmd.Resource == "/" {
376376
cmd.Resource = "/index.php"
377377
}

pkg/app/master/probe/http/swagger.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ func isOpenAPI(data []byte) bool {
157157
}
158158

159159
func apiSpecPrefix(spec *openapi3.T) (string, error) {
160-
//for now get the api prefix from the first server struc
160+
//for now get the api prefix from the first server struct
161161
//later, support multiple prefixes if there's more than one server struct
162162
var prefix string
163163
for _, sinfo := range spec.Servers {

0 commit comments

Comments
 (0)