whitespace

Author: vszakats

.gitignore

@@ -1,2 +1,2 @@
 .idea
-venv
+venv

CHANGELOG.md

@@ -121,7 +121,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - fix entrypoint perms
 
 ## [8.1.2-2] - 2023-06-08
-### Added 
+### Added
 - curl-dev-fedora:master
 - curl-dev-debian:master
 ### Changed
@@ -138,4 +138,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - created [curl-container repo](https://github.com/curl/curl-container/pull/1)
 ### Changed
-- generate [curl:8.1.2 release](https://github.com/curl/curl/releases/tag/curl-8_1_2) images on [alpine 3.18.0](https://alpinelinux.org/posts/Alpine-3.18.0-released.html) 
+- generate [curl:8.1.2 release](https://github.com/curl/curl/releases/tag/curl-8_1_2) images on [alpine 3.18.0](https://alpinelinux.org/posts/Alpine-3.18.0-released.html)

README.md

@@ -1,9 +1,9 @@
 # Curl Container
 
-[![build_master_multi_images](https://github.com/curl/curl-container/actions/workflows/build_master_multi.yml/badge.svg)](https://github.com/curl/curl-container/actions/workflows/build_master_multi.yml) 
+[![build_master_multi_images](https://github.com/curl/curl-container/actions/workflows/build_master_multi.yml/badge.svg)](https://github.com/curl/curl-container/actions/workflows/build_master_multi.yml)
 [![build_latest_release_multi_images](https://github.com/curl/curl-container/actions/workflows/build_latest_release_multi.yml/badge.svg)](https://github.com/curl/curl-container/actions/workflows/build_latest_release_multi.yml)
 
-This repository contains infrastructure/code that generates, tests and distributes the Official curl docker images 
+This repository contains infrastructure/code that generates, tests and distributes the Official curl docker images
 available from the following registries:
 * [quay.io](https://quay.io/curl/curl): curl images distributed by Quay.io
 * [docker.io](https://hub.docker.com/r/curlimages/curl): curl images distributed by docker.io
@@ -57,7 +57,7 @@ or [Jim Fuller](jim.fuller@webcomposite.com) directly.
 The following images are available via [github packages](https://github.com/orgs/curl/packages).
 
 Master branch built regularly:
-* **curl-dev:master** - curl-dev **master** branch 
+* **curl-dev:master** - curl-dev **master** branch
 * **curl-base:master** - curl-base **master** branch
 * **curl:master** - curl **master** branch
 * **curl-multi:master** - curl multiarch **master** branch
@@ -71,24 +71,24 @@ Platform specific dev images built daily:
 * **curl-dev-debian:master** - debian based development environment
 * **curl-dev-fedora:master** - fedora based development environment
 
-To use any of these development images; 
+To use any of these development images;
 ```
 > podman run -it -v /Users/exampleuser/src/curl:/src/curl  ghcr.io/curl/curl-container/curl-dev-debian:master zsh
 > ./buildconf
 > ./configure
 > make
 ```
 
-**Note**- dev images are not specifically scanned for vulnerabilities and we currently _pin_ to latest which 
+**Note**- dev images are not specifically scanned for vulnerabilities and we currently _pin_ to latest which
 always has vulns ... **use at your own risk**. Perhaps we could consider _pinning_ to a later 'vintage'.
 
 ## Dependencies
 
 Either of the following are required to use images:
-* [podman](https://podman.io/getting-started/) 
+* [podman](https://podman.io/getting-started/)
 * [docker](https://docs.docker.com/get-docker/)
 
-The following are required to build or release images: 
+The following are required to build or release images:
 * [buildah](https://buildah.io/): used for composing dev/build images
 * [qemu-user-static](https://github.com/multiarch/qemu-user-static): used for building multiarch images
 
@@ -106,4 +106,3 @@ The release process is as follows:
 * raise prep PR, review and merge
 * create [new release](https://github.com/curl/curl-container/releases/new) with new tag ( ex. 8.1.2 ) based on previously created branch
 * new tag will trigger CI for publishing to quay/docker
-

adrs/01-design.md

@@ -69,7 +69,7 @@ Enhance testing
 We could keep the status quo (eg. ugly bash/makefile) though it is hard to maintain... also current release process is completely
 opaque and non automated.
 
-We could have opted for other container build frameworks/language or other adjuncts (ex. [skopeo](https://github.com/containers/skopeo)) ... 
+We could have opted for other container build frameworks/language or other adjuncts (ex. [skopeo](https://github.com/containers/skopeo)) ...
 buildah seemed to have the right set of features and mature ... perhaps in the future we will have even more choices.
 
 Presumably we could have gone full 'code as infrastructure' and invoke buildah programmatically ... opted for shell scripts

create_dev_image.sh

@@ -95,4 +95,3 @@ buildah config --label org.opencontainers.image.licenses="MIT" $bdr
 
 # commit image
 buildah commit $bdr "${image_name}" # --disable-compression false --squash --sign-by --tls-verify
-

create_multi.sh

@@ -27,10 +27,9 @@ buildah manifest create curl-multi:${release_tag}
 for IMGTAG in "linux/386" "linux/arm/v7" "linux/amd64" "linux/arm64" "linux/ppc64le" ; do
   pathname="${IMGTAG////-}"
   echo "building $IMGTAG : $pathname"
- 	./create_dev_image.sh "$IMGTAG" ${base} ${compiler} "$dev_deps" "$build_opts" ${branch_or_ref} curl-dev-${pathname}:${release_tag} 0
- 	./create_base_image.sh "$IMGTAG" ${base} localhost/curl-dev-${pathname}:${release_tag} "$base_deps" curl-base-${pathname}:${release_tag} ${release_tag}
- 	buildah manifest add curl-base-multi:${release_tag} localhost/curl-base-${pathname}:${release_tag};
- 	./create_appliance_image.sh "$IMGTAG" localhost/curl-base-${pathname}:${release_tag} curl-${pathname}:${release_tag} ${release_tag}
- 	buildah manifest add curl-multi:${release_tag} localhost/curl-${pathname}:${release_tag};
+  ./create_dev_image.sh "$IMGTAG" ${base} ${compiler} "$dev_deps" "$build_opts" ${branch_or_ref} curl-dev-${pathname}:${release_tag} 0
+  ./create_base_image.sh "$IMGTAG" ${base} localhost/curl-dev-${pathname}:${release_tag} "$base_deps" curl-base-${pathname}:${release_tag} ${release_tag}
+  buildah manifest add curl-base-multi:${release_tag} localhost/curl-base-${pathname}:${release_tag};
+  ./create_appliance_image.sh "$IMGTAG" localhost/curl-base-${pathname}:${release_tag} curl-${pathname}:${release_tag} ${release_tag}
+  buildah manifest add curl-multi:${release_tag} localhost/curl-${pathname}:${release_tag};
 done
-