Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Sep 25, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions hack/generate/samples/ansible/advanced_molecule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion hack/generate/samples/ansible/memcached_molecule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion pkg/plugins/ansible/v1/scaffolds/internal/templates/dockerfile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion testdata/memcached-molecule-operator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down