switch release image repo to quay.io/operator-framework/ansible-operator (#12)

everettraven · web-flow · commit cc48b06a3534 · 2023-09-25T12:39:14.000-04:00
Signed-off-by: Bryce Palmer &lt;bpalmer@redhat.com&gt;
diff --git a/Makefile b/Makefile
@@ -33,7 +33,7 @@ export GO111MODULE = on
 export CGO_ENABLED = 0
 export PATH := $(PWD)/$(BUILD_DIR):$(PWD)/$(TOOLS_DIR):$(PATH)
 
-export IMAGE_REPO ?= quay.io/operator-framework/ansible-operator-plugins
+export IMAGE_REPO ?= quay.io/operator-framework/ansible-operator
 export IMAGE_TAG ?= dev
 
 ##@ Development
@@ -93,7 +93,7 @@ DOCKER_PROGRESS = --progress plain
 endif
 image/%: export DOCKER_CLI_EXPERIMENTAL = enabled
 image/%:
-	docker buildx build $(DOCKER_PROGRESS) -t $(BUILD_IMAGE_REPO)/$*-plugins:dev -f ./images/$*/Dockerfile --load . --no-cache
+	docker buildx build $(DOCKER_PROGRESS) -t $(BUILD_IMAGE_REPO)/$*:$(IMAGE_TAG) -f ./images/$*/Dockerfile --load . --no-cache
 ##@ Release
 
 ## TODO: Add release targets here
diff --git a/hack/generate/samples/ansible/advanced_molecule.go b/hack/generate/samples/ansible/advanced_molecule.go
@@ -201,8 +201,8 @@ func updateDockerfile(dir string) {
 	log.Info("replacing project Dockerfile to use ansible base image with the dev tag")
 	err := kbutil.ReplaceRegexInFile(
 		filepath.Join(dir, "Dockerfile"),
-		"quay.io/operator-framework/ansible-operator-plugins:.*",
-		"quay.io/operator-framework/ansible-operator-plugins:dev")
+		"quay.io/operator-framework/ansible-operator:.*",
+		"quay.io/operator-framework/ansible-operator:dev")
 	pkg.CheckError("replacing Dockerfile", err)
 
 	log.Info("inserting code to Dockerfile")
diff --git a/hack/generate/samples/ansible/memcached_molecule.go b/hack/generate/samples/ansible/memcached_molecule.go
@@ -77,7 +77,7 @@ func ImplementMemcachedMolecule(sample sample.Sample, image string) {
 	}
 
 	log.Info("replacing project Dockerfile to use ansible base image with the dev tag")
-	err := kbutil.ReplaceRegexInFile(filepath.Join(sample.Dir(), "Dockerfile"), "quay.io/operator-framework/ansible-operator-plugins:.*", "quay.io/operator-framework/ansible-operator-plugins:dev")
+	err := kbutil.ReplaceRegexInFile(filepath.Join(sample.Dir(), "Dockerfile"), "quay.io/operator-framework/ansible-operator:.*", "quay.io/operator-framework/ansible-operator:dev")
 	pkg.CheckError("replacing Dockerfile", err)
 
 	log.Info("adding RBAC permissions")
diff --git a/pkg/plugins/ansible/v1/scaffolds/internal/templates/dockerfile.go b/pkg/plugins/ansible/v1/scaffolds/internal/templates/dockerfile.go
@@ -54,7 +54,7 @@ func (f *Dockerfile) SetTemplateDefaults() error {
 	return nil
 }
 
-const dockerfileTemplate = `FROM quay.io/operator-framework/ansible-operator-plugins:{{ .AnsibleOperatorVersion }}
+const dockerfileTemplate = `FROM quay.io/operator-framework/ansible-operator:{{ .AnsibleOperatorVersion }}
 
 COPY requirements.yml ${HOME}/requirements.yml
 RUN ansible-galaxy collection install -r ${HOME}/requirements.yml \
diff --git a/testdata/memcached-molecule-operator/Dockerfile b/testdata/memcached-molecule-operator/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/operator-framework/ansible-operator-plugins:dev
+FROM quay.io/operator-framework/ansible-operator:dev
 
 COPY requirements.yml ${HOME}/requirements.yml
 RUN ansible-galaxy collection install -r ${HOME}/requirements.yml \

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ func ImplementMemcachedMolecule(sample sample.Sample, image string) {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`log.Info("replacing project Dockerfile to use ansible base image with the dev tag")`
`80`		`- err := kbutil.ReplaceRegexInFile(filepath.Join(sample.Dir(), "Dockerfile"), "quay.io/operator-framework/ansible-operator-plugins:.*", "quay.io/operator-framework/ansible-operator-plugins:dev")`
	`80`	`+ err := kbutil.ReplaceRegexInFile(filepath.Join(sample.Dir(), "Dockerfile"), "quay.io/operator-framework/ansible-operator:.*", "quay.io/operator-framework/ansible-operator:dev")`
`81`	`81`	`pkg.CheckError("replacing Dockerfile", err)`
`82`	`82`
`83`	`83`	`log.Info("adding RBAC permissions")`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ func (f *Dockerfile) SetTemplateDefaults() error {`
`54`	`54`	`return nil`
`55`	`55`	`}`
`56`	`56`
`57`		-const dockerfileTemplate = `FROM quay.io/operator-framework/ansible-operator-plugins:{{ .AnsibleOperatorVersion }}
	`57`	+const dockerfileTemplate = `FROM quay.io/operator-framework/ansible-operator:{{ .AnsibleOperatorVersion }}
`58`	`58`
`59`	`59`	`COPY requirements.yml ${HOME}/requirements.yml`
`60`	`60`	`RUN ansible-galaxy collection install -r ${HOME}/requirements.yml \`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM quay.io/operator-framework/ansible-operator-plugins:dev`
	`1`	`+FROM quay.io/operator-framework/ansible-operator:dev`
`2`	`2`
`3`	`3`	`COPY requirements.yml ${HOME}/requirements.yml`
`4`	`4`	`RUN ansible-galaxy collection install -r ${HOME}/requirements.yml \`