Merge pull request #612 from shanemcd/allow-awx-version-override

Allow for overriding default AWX version as env var

Dockerfile

@@ -1,5 +1,8 @@
 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
 RUN ansible-galaxy collection install -r ${HOME}/requirements.yml \
  && chmod -R ug+rwx ${HOME}/.ansible

Makefile

@@ -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
 
 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 ${IMG}

roles/installer/defaults/main.yml

@@ -108,7 +108,7 @@ extra_volumes: ''
 # Use these image versions for 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_version: latest
 postgres_image: postgres