many: rename image-builder-cli -> image-builder

.github/workflows/container.yaml

@@ -33,7 +33,9 @@ jobs:
         uses: docker/metadata-action@v6
         id: meta
         with:
-          images: ghcr.io/osbuild/image-builder-cli
+          images: |
+            ghcr.io/osbuild/image-builder
+            ghcr.io/osbuild/image-builder-cli
           tags: |
             type=ref,event=tag,enable=${{ startsWith(github.ref, 'refs/tags/') }}
             type=raw,value=latest
@@ -46,6 +48,6 @@ jobs:
           platforms: linux/amd64,linux/arm64
           file: ./Containerfile
           push: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/') }}
-          cache-from: type=registry,ref=ghcr.io/osbuild/image-builder-cli:latest
+          cache-from: type=registry,ref=ghcr.io/osbuild/image-builder:latest
           cache-to: type=inline
           tags: ${{ steps.meta.outputs.tags }}

Makefile

@@ -49,8 +49,8 @@ GOLANGCI_COMPOSER_IMAGE=composer_golangci
 
 VERSION := $(shell ( git describe --tags --abbrev=0 2>/dev/null || echo v1 ) | sed 's|v||')
 COMMIT = $(shell (cd "$(SRCDIR)" && git rev-parse HEAD))
-PACKAGE_NAME_VERSION = image-builder-cli-$(VERSION)
-PACKAGE_NAME_COMMIT = image-builder-cli-$(COMMIT)
+PACKAGE_NAME_VERSION = image-builder-$(VERSION)
+PACKAGE_NAME_COMMIT = image-builder-$(COMMIT)
 
 #
 # Generic Targets

README.md

@@ -7,7 +7,7 @@ Build images from the command line in a convenient way.
 ```console
 $ sudo podman run --privileged \
    -v ./output:/output \
-   ghcr.io/osbuild/image-builder-cli:latest \
+   ghcr.io/osbuild/image-builder:latest \
    build \
    --distro fedora-43 \
    minimal-raw
@@ -41,24 +41,24 @@ $ dnf install image-builder
 You can also install `image-builder` via the go build system.
 
 ```console
-$ go run github.com/osbuild/image-builder-cli/cmd/image-builder@main
+$ go run github.com/osbuild/image-builder/cmd/image-builder@main
 ```
 or install it into `$GOPATH/bin`
 ```console
-$ go install github.com/osbuild/image-builder-cli/cmd/image-builder@main
+$ go install github.com/osbuild/image-builder/cmd/image-builder@main
 ```
 
 Lastly you can use a container:
 
 ```console
-$ sudo podman run --privileged ghcr.io/osbuild/image-builder-cli
+$ sudo podman run --privileged ghcr.io/osbuild/image-builder
 ```
 
 When building an image in the container it will be written to `/output` in the container. If you want the produced images available on your host system mount that directory:
 
 ```console
 $ mkdir output
-$ sudo podman run --privileged -v ./output:/output ghcr.io/osbuild/image-builder-cli
+$ sudo podman run --privileged -v ./output:/output ghcr.io/osbuild/image-builder
 ```
 
 ## Compilation
@@ -336,7 +336,7 @@ caution.
 
 ## Subscriptions
 
-When executing `image-builder-cli` via `podman`, subscription information is
+When executing `image-builder` via `podman`, subscription information is
 passed to the container and used to access Red Hat CDN. As long as the host
 machine is properly subscribed with attached Red Hat Enterprise Linux
 subscription, building RHEL images will work automatically.
@@ -371,13 +371,13 @@ A: This is a safety feature so that in e.g. CI systems warnings cannot
 ## Project
 
  * **Website**: <https://www.osbuild.org>
- * **Bug Tracker**: <https://github.com/osbuild/image-builder-cli/issues>
+ * **Bug Tracker**: <https://github.com/osbuild/image-builder/issues>
  * **Discussions**: <https://github.com/orgs/osbuild/discussions>
  * **Matrix (chat)**: [Image Builder channel on Fedora Chat](https://matrix.to/#/#image-builder:fedoraproject.org?web-instance[element.io]=chat.fedoraproject.org)
- * **Changelog**: <https://github.com/osbuild/image-builder-cli/releases>
+ * **Changelog**: <https://github.com/osbuild/image-builder/releases>
 
 ### Repository
 
- - **web**:   <https://github.com/osbuild/image-builder-cli>
- - **https**: `https://github.com/osbuild/image-builder-cli.git`
- - **ssh**:   `git@github.com:osbuild/image-builder-cli.git`
+ - **web**:   <https://github.com/osbuild/image-builder>
+ - **https**: `https://github.com/osbuild/image-builder.git`
+ - **ssh**:   `git@github.com:osbuild/image-builder.git`

cmd/image-builder/bib_main.go

@@ -32,9 +32,9 @@ import (
 	"github.com/osbuild/images/pkg/reporegistry"
 	"github.com/osbuild/images/pkg/rpmmd"
 
-	"github.com/osbuild/image-builder-cli/internal/bibimg"
-	"github.com/osbuild/image-builder-cli/pkg/progress"
-	"github.com/osbuild/image-builder-cli/pkg/setup"
+	"github.com/osbuild/image-builder/internal/bibimg"
+	"github.com/osbuild/image-builder/pkg/progress"
+	"github.com/osbuild/image-builder/pkg/setup"
 )
 
 var (

cmd/image-builder/bib_main_test.go

@@ -18,7 +18,7 @@ import (
 	"github.com/osbuild/images/pkg/cloud"
 	"github.com/osbuild/images/pkg/cloud/awscloud"
 
-	main "github.com/osbuild/image-builder-cli/cmd/image-builder"
+	main "github.com/osbuild/image-builder/cmd/image-builder"
 )
 
 func TestCanChownInPathHappy(t *testing.T) {

cmd/image-builder/build.go

@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/osbuild/image-builder-cli/pkg/progress"
+	"github.com/osbuild/image-builder/pkg/progress"
 	"github.com/osbuild/images/pkg/imagefilter"
 )
 

cmd/image-builder/describeimg_test.go

@@ -12,7 +12,7 @@ import (
 
 	testrepos "github.com/osbuild/images/test/data/repositories"
 
-	main "github.com/osbuild/image-builder-cli/cmd/image-builder"
+	main "github.com/osbuild/image-builder/cmd/image-builder"
 )
 
 func TestDescribeImage(t *testing.T) {

cmd/image-builder/distro_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	main "github.com/osbuild/image-builder-cli/cmd/image-builder"
+	main "github.com/osbuild/image-builder/cmd/image-builder"
 )
 
 func TestFindDistro(t *testing.T) {

cmd/image-builder/filters_test.go

@@ -7,7 +7,7 @@ import (
 
 	testrepos "github.com/osbuild/images/test/data/repositories"
 
-	main "github.com/osbuild/image-builder-cli/cmd/image-builder"
+	main "github.com/osbuild/image-builder/cmd/image-builder"
 )
 
 func TestGetOneImageHappy(t *testing.T) {

cmd/image-builder/main.go

@@ -17,7 +17,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
-	"github.com/osbuild/image-builder-cli/pkg/progress"
+	"github.com/osbuild/image-builder/pkg/progress"
 	"github.com/osbuild/images/pkg/arch"
 	"github.com/osbuild/images/pkg/bootc"
 	"github.com/osbuild/images/pkg/customizations/subscription"
@@ -28,9 +28,9 @@ import (
 	"github.com/osbuild/images/pkg/osbuild"
 	"github.com/osbuild/images/pkg/ostree"
 
-	"github.com/osbuild/image-builder-cli/internal/blueprintload"
-	"github.com/osbuild/image-builder-cli/internal/olog"
-	"github.com/osbuild/image-builder-cli/pkg/setup"
+	"github.com/osbuild/image-builder/internal/blueprintload"
+	"github.com/osbuild/image-builder/internal/olog"
+	"github.com/osbuild/image-builder/pkg/setup"
 )
 
 var (

cmd/image-builder/main_test.go

@@ -24,8 +24,8 @@ import (
 	"github.com/osbuild/images/pkg/rpmmd"
 	testrepos "github.com/osbuild/images/test/data/repositories"
 
-	main "github.com/osbuild/image-builder-cli/cmd/image-builder"
-	"github.com/osbuild/image-builder-cli/internal/testutil"
+	main "github.com/osbuild/image-builder/cmd/image-builder"
+	"github.com/osbuild/image-builder/internal/testutil"
 	"github.com/osbuild/images/pkg/arch"
 )
 

cmd/image-builder/manifest.go

@@ -18,7 +18,7 @@ import (
 	"github.com/osbuild/images/pkg/rhsm/facts"
 	"github.com/osbuild/images/pkg/sbom"
 
-	"github.com/osbuild/image-builder-cli/internal/blueprintload"
+	"github.com/osbuild/image-builder/internal/blueprintload"
 )
 
 type manifestOptions struct {

cmd/image-builder/upload.go

@@ -12,7 +12,7 @@ import (
 	"github.com/cheggaaa/pb/v3"
 	"github.com/spf13/cobra"
 
-	"github.com/osbuild/image-builder-cli/pkg/progress"
+	"github.com/osbuild/image-builder/pkg/progress"
 	"github.com/osbuild/images/pkg/arch"
 	"github.com/osbuild/images/pkg/cloud"
 	"github.com/osbuild/images/pkg/cloud/awscloud"

cmd/image-builder/upload_test.go

@@ -16,8 +16,8 @@ import (
 	"github.com/osbuild/images/pkg/cloud/awscloud"
 	"github.com/osbuild/images/pkg/platform"
 
-	main "github.com/osbuild/image-builder-cli/cmd/image-builder"
-	"github.com/osbuild/image-builder-cli/internal/testutil"
+	main "github.com/osbuild/image-builder/cmd/image-builder"
+	"github.com/osbuild/image-builder/internal/testutil"
 )
 
 func TestUploadWithAWSMock(t *testing.T) {

cmd/image-builder/version_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	main "github.com/osbuild/image-builder-cli/cmd/image-builder"
+	main "github.com/osbuild/image-builder/cmd/image-builder"
 )
 
 func TestVersionFlagDeprecated(t *testing.T) {

doc/00-installation.md

@@ -37,7 +37,7 @@ $ sudo podman run \
     --rm \
     -it \
     -v ./output:/output \
-    ghcr.io/osbuild/image-builder-cli:latest \
+    ghcr.io/osbuild/image-builder:latest \
     build --distro fedora-43 minimal-raw-xz
 # ...
 ```
@@ -49,9 +49,9 @@ Another option, and this might be most useful while hacking on the source is to
 ```console
 $ sudo dnf install go git-core osbuild osbuild-depsolve-dnf osbuild-ostree osbuild-lvm2 osbuild-luks2
 # ...
-$ git clone github.com/osbuild/image-builder-cli
+$ git clone github.com/osbuild/image-builder
 # ...
-$ cd image-builder-cli
+$ cd image-builder
 $ go build ./cmd/image-builder
 # ...
 $ sudo ./image-builder build --distro fedora-43 minimal-raw-xz

doc/10-faq.md

@@ -10,7 +10,7 @@ The Image Builder team provides a bunch of tools that people can use to build, d
 2. [osbuild-composer](https://github.com/osbuild/osbuild-composer) is the component that provides APIs for the [Image Builder service](https://console.redhat.com/insights/image-builder/) in such a way that you can host them locally.
 3. [weldr-client](https://github.com/osbuild/weldr-client) is an application that uses the [osbuild-composer](https://github.com/osbuild/osbuild-composer) provided APIs to offer a local command line program to start, stop, and manage builds.
 
-The above can be quite confusing, hence we've created `image-builder`. It allows you to do the same things as [weldr-client](https://github.com/osbuild/weldr-client) except it does so without the need to run [osbuild-composer](https://github.com/osbuild/osbuild-composer). Builds are done directly without going through other layers. This makes [image-builder](https://github.com/osbuild/image-builder-cli) easier to install and use in a lot of environments.
+The above can be quite confusing, hence we've created `image-builder`. It allows you to do the same things as [weldr-client](https://github.com/osbuild/weldr-client) except it does so without the need to run [osbuild-composer](https://github.com/osbuild/osbuild-composer). Builds are done directly without going through other layers. This makes [image-builder](https://github.com/osbuild/image-builder) easier to install and use in a lot of environments.
 
 ## Why does `image-builder` need `root` permissions?
 

doc/30-build-systems.md

@@ -10,7 +10,7 @@
 
 Some of the information here is specific to the Koji instance you're speaking to, if this is the case this is noted in a comment.
 
-As a user you want to `koji-image-builder-cli` package installed on your system which provides a subcommand to your `koji` command to schedule builds. To schedule a build you can use the following command:
+As a user you want to `koji-image-builder` package installed on your system which provides a subcommand to your `koji` command to schedule builds. To schedule a build you can use the following command:
 
 ```
 koji image-builder-build \

doc/index.md

@@ -2,4 +2,4 @@
 
 The `image-builder` project provides image building with [user customizations](./01-usage.md#blueprints) for a variety of predefined operating systems like Fedora, CentOS, and RHEL.
 
-For any questions you can take a look at our [FAQ](./10-faq.md) or the [GitHub issues](https://github.com/osbuild/image-builder-cli) and [GitHub discussions](https://github.com/orgs/osbuild/discussions). We're also available in the [#image-builder:fedoraproject.org](https://matrix.to/#/#image-builder:fedoraproject.org?web-instance%5Belement.io%5D=chat.fedoraproject.org) Matrix channel.
+For any questions you can take a look at our [FAQ](./10-faq.md) or the [GitHub issues](https://github.com/osbuild/image-builder) and [GitHub discussions](https://github.com/orgs/osbuild/discussions). We're also available in the [#image-builder:fedoraproject.org](https://matrix.to/#/#image-builder:fedoraproject.org?web-instance%5Belement.io%5D=chat.fedoraproject.org) Matrix channel.

go.mod

@@ -1,4 +1,4 @@
-module github.com/osbuild/image-builder-cli
+module github.com/osbuild/image-builder
 
 // keep in sync with images,
 // c.f. https://github.com/osbuild/images/blob/main/go.mod

image-builder.spec

@@ -5,7 +5,7 @@
 # and go back to 129.
 %global min_osbuild_version 181
 
-%global goipath         github.com/osbuild/image-builder-cli
+%global goipath         github.com/osbuild/image-builder
 
 Version:        66
 
@@ -27,7 +27,7 @@ ExcludeArch:    i686
 License:        Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND CC-BY-SA-4.0 AND ISC AND MIT AND MPL-2.0 AND Unlicense
 
 URL:            %{gourl}
-Source0:        https://github.com/osbuild/image-builder-cli/releases/download/v%{version}/image-builder-cli-%{version}.tar.gz
+Source0:        https://github.com/osbuild/image-builder/releases/download/v%{version}/image-builder-%{version}.tar.gz
 
 
 BuildRequires:  %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}

internal/bibimg/imagetypes_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/osbuild/image-builder-cli/internal/bibimg"
+	"github.com/osbuild/image-builder/internal/bibimg"
 )
 
 type testCase struct {

internal/blueprintload/blueprintload_test.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/osbuild/blueprint/pkg/blueprint"
 
-	"github.com/osbuild/image-builder-cli/internal/blueprintload"
+	"github.com/osbuild/image-builder/internal/blueprintload"
 )
 
 var testBlueprintJSON = `{

internal/testutil/testutil_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/osbuild/image-builder-cli/internal/testutil"
+	"github.com/osbuild/image-builder/internal/testutil"
 )
 
 func TestMockCommand(t *testing.T) {

pkg/progress/command_test.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/osbuild/image-builder-cli/pkg/progress"
+	"github.com/osbuild/image-builder/pkg/progress"
 )
 
 func makeFakeOsbuild(t *testing.T, content string) string {

pkg/progress/progress.go

@@ -13,7 +13,7 @@ import (
 
 	"github.com/cheggaaa/pb/v3"
 
-	"github.com/osbuild/image-builder-cli/pkg/util"
+	"github.com/osbuild/image-builder/pkg/util"
 )
 
 var (

pkg/progress/progress_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/osbuild/image-builder-cli/pkg/progress"
+	"github.com/osbuild/image-builder/pkg/progress"
 )
 
 func TestProgressNew(t *testing.T) {

pkg/progress/syncwriter_test.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/osbuild/image-builder-cli/pkg/progress"
+	"github.com/osbuild/image-builder/pkg/progress"
 )
 
 func TestSyncWriter(t *testing.T) {

pkg/setup/setup.go

@@ -11,8 +11,8 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/osbuild/image-builder-cli/pkg/podmanutil"
-	"github.com/osbuild/image-builder-cli/pkg/util"
+	"github.com/osbuild/image-builder/pkg/podmanutil"
+	"github.com/osbuild/image-builder/pkg/util"
 )
 
 // EnsureEnvironment mutates external filesystem state as necessary

pkg/setup/setup_test.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/osbuild/image-builder-cli/pkg/setup"
+	"github.com/osbuild/image-builder/pkg/setup"
 )
 
 func TestValidateCanRunTargetArchTrivial(t *testing.T) {

pkg/util/util.go

@@ -6,7 +6,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/osbuild/image-builder-cli/internal/olog"
+	"github.com/osbuild/image-builder/internal/olog"
 )
 
 // IsMountpoint checks if the target path is a mount point

pkg/util/util_test.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/osbuild/image-builder-cli/pkg/util"
+	"github.com/osbuild/image-builder/pkg/util"
 )
 
 func TestOutputErrPassthrough(t *testing.T) {