Skip to content

Commit

Permalink
Dockerfile: Update the ansible-operator to v1.x
Browse files Browse the repository at this point in the history
Update the Dockerfile.metering-ansible-operator* Dockerfile(s) to work with the v1.x ansible-operator version.

With the v1 binary, the ansible-operator expects a `run` subcommand with a watches file.
  • Loading branch information
timflannagan committed Dec 4, 2020
1 parent 00f6672 commit 1ed464f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.metering-ansible-operator
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM quay.io/openshift/origin-metering-helm:latest as helm
# final image needs kubectl, so we copy `oc` from cli image to use as kubectl.
FROM quay.io/openshift/origin-cli:latest as cli
# the base image is the ansible-operator's origin images
FROM quay.io/operator-framework/ansible-operator:v0.19.4
FROM quay.io/operator-framework/ansible-operator:v1.0.1

USER root
RUN set -x; INSTALL_PKGS="curl bash ca-certificates less which openssl" \
Expand Down Expand Up @@ -47,7 +47,7 @@ COPY charts/openshift-metering ${HELM_CHART_PATH}
COPY manifests/deploy/openshift/olm/bundle /manifests

USER 1001
ENTRYPOINT ["tini", "--", "/usr/local/bin/ansible-operator", "--watches-file", "/opt/ansible/watches.yaml"]
ENTRYPOINT ["tini", "--", "/usr/local/bin/ansible-operator", "run", "--watches-file", "/opt/ansible/watches.yaml"]

LABEL io.k8s.display-name="OpenShift metering-ansible-operator" \
io.k8s.description="This is a component of OpenShift Container Platform and manages installation and configuration of all other metering components." \
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile.metering-ansible-operator.rhel8
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,8 @@ COPY charts/openshift-metering ${HELM_CHART_PATH}

COPY manifests/deploy/openshift/olm/bundle /manifests

ENTRYPOINT ["tini", "--", "/usr/local/bin/ansible-operator", "--watches-file", "/opt/ansible/watches.yaml"]

USER 1001
ENTRYPOINT ["tini", "--", "/usr/local/bin/ansible-operator", "run", "--watches-file", "/opt/ansible/watches.yaml"]

LABEL io.k8s.display-name="OpenShift metering-ansible-operator" \
io.k8s.description="This is a component of OpenShift Container Platform and manages installation and configuration of all other metering components." \
Expand Down

0 comments on commit 1ed464f

Please sign in to comment.