internet/awx-operator
3
0
Fork 0
mirror of https://github.com/ansible/awx-operator.git synced 2026-05-08 06:12:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow for overriding default AWX version as env var

Browse Source
This commit is contained in:
Shane McDonald
2021-10-18 17:28:11 -04:00
parent 3d6094a5b0
commit 7b59c36263
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@@ -1,5 +1,8 @@
FROM quay.io/operator-framework/ansible-operator:v1.12.0 FROM quay.io/operator-framework/ansible-operator:v1.12.0
ARG DEFAULT_AWX_VERSION
ENV DEFAULT_AWX_VERSION=${DEFAULT_AWX_VERSION}
COPY requirements.yml ${HOME}/requirements.yml COPY requirements.yml ${HOME}/requirements.yml
RUN ansible-galaxy collection install -r ${HOME}/requirements.yml \ RUN ansible-galaxy collection install -r ${HOME}/requirements.yml \
&& chmod -R ug+rwx ${HOME}/.ansible && chmod -R ug+rwx ${HOME}/.ansible

2
Makefile
View File

@@ -63,7 +63,7 @@ run: ansible-operator ## Run against the configured Kubernetes cluster in ~/.kub
ANSIBLE_ROLES_PATH="$(ANSIBLE_ROLES_PATH):$(shell pwd)/roles" $(ANSIBLE_OPERATOR) run ANSIBLE_ROLES_PATH="$(ANSIBLE_ROLES_PATH):$(shell pwd)/roles" $(ANSIBLE_OPERATOR) run
docker-build: ## Build docker image with the manager. docker-build: ## Build docker image with the manager.
docker build -t ${IMG} . docker build $(BUILD_ARGS) -t ${IMG} .
docker-push: ## Push docker image with the manager. docker-push: ## Push docker image with the manager.
docker push ${IMG} docker push ${IMG}

2
roles/installer/defaults/main.yml
View File

@@ -108,7 +108,7 @@ extra_volumes: ''
# Use these image versions for Ansible AWX. # Use these image versions for Ansible AWX.
image: quay.io/ansible/awx image: quay.io/ansible/awx
image_version: 19.4.0 image_version: "{{ lookup('env', 'DEFAULT_AWX_VERSION') or 'latest' }}"
redis_image: docker.io/redis redis_image: docker.io/redis
redis_image_version: latest redis_image_version: latest
postgres_image: postgres postgres_image: postgres