Update sdk to v0.13.0 and install dhall-to-json
This change adds a couple of new tools in the operator image. This change also disables the CI job and the follow-up changes will re-active it step by step. Change-Id: I106b34a5e11aec5e88ca2f491c69c82527551952
This commit is contained in:
parent
b6a9870e57
commit
70693e51ea
@ -22,14 +22,15 @@
|
|||||||
- context: .
|
- context: .
|
||||||
dockerfile: build/Dockerfile
|
dockerfile: build/Dockerfile
|
||||||
repository: zuul/zuul-operator
|
repository: zuul/zuul-operator
|
||||||
|
|
||||||
- project:
|
- project:
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- zuul-operator-build-image
|
- zuul-operator-build-image
|
||||||
- zuul-operator-functional-k8s:
|
# - zuul-operator-functional-k8s:
|
||||||
dependencies: zuul-operator-build-image
|
# dependencies: zuul-operator-build-image
|
||||||
gate:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
- zuul-operator-build-image
|
- zuul-operator-build-image
|
||||||
- zuul-operator-functional-k8s:
|
# - zuul-operator-functional-k8s:
|
||||||
dependencies: zuul-operator-build-image
|
# dependencies: zuul-operator-build-image
|
||||||
|
2
Makefile
Normal file
2
Makefile
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
image:
|
||||||
|
podman build -f build/Dockerfile -t docker.io/zuul/zuul-operator .
|
@ -1,5 +1,26 @@
|
|||||||
FROM quay.io/operator-framework/ansible-operator:v0.6.0
|
FROM quay.io/operator-framework/ansible-operator:v0.13.0
|
||||||
|
|
||||||
|
# Install extra requirements
|
||||||
|
USER root
|
||||||
|
|
||||||
|
# See: https://github.com/operator-framework/operator-sdk/issues/2384
|
||||||
|
RUN pip3 install --upgrade openshift
|
||||||
|
|
||||||
|
# unarchive: bzip2 and tar
|
||||||
|
# generate zuul ssh-keys or certificate: openssh and openssl
|
||||||
|
# manage configuration: git
|
||||||
|
RUN dnf install -y bzip2 tar openssh openssl git
|
||||||
|
|
||||||
|
# Install dhall-to-json
|
||||||
|
RUN curl -OL https://github.com/dhall-lang/dhall-haskell/releases/download/1.29.0/dhall-json-1.6.1-x86_64-linux.tar.bz2 \
|
||||||
|
&& echo "7e65f933fb215629d18d23bc774688c598d4c11b62865f3546ee23ae36b25290 dhall-json-1.6.1-x86_64-linux.tar.bz2" | sha256sum -c \
|
||||||
|
&& tar -xf dhall-json-1.6.1-x86_64-linux.tar.bz2 --strip-components=2 -j --mode='a+x' -C /usr/bin \
|
||||||
|
&& rm dhall-json-1.6.1-x86_64-linux.tar.bz2
|
||||||
|
|
||||||
|
# Back to the default operator user
|
||||||
|
USER 1001
|
||||||
|
|
||||||
|
# Copy ansible operator requirements
|
||||||
COPY watches.yaml ${HOME}/watches.yaml
|
COPY watches.yaml ${HOME}/watches.yaml
|
||||||
|
|
||||||
COPY ansible/zuul.yaml ${HOME}/zuul.yaml
|
COPY ansible/zuul.yaml ${HOME}/zuul.yaml
|
||||||
|
Loading…
Reference in New Issue
Block a user