From f4aacebb86e2e1ddf68a34abb7087ea46ff297a6 Mon Sep 17 00:00:00 2001
From: Shane McDonald <me@shanemcd.com>
Date: Mon, 7 Aug 2017 17:30:57 -0400
Subject: [PATCH] Fix OpenShift container image builds

---
 Makefile                       | 2 +-
 installer/openshift/Dockerfile | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index e4971d7477..59d306b622 100644
--- a/Makefile
+++ b/Makefile
@@ -606,7 +606,7 @@ VERSION:
 
 production-openshift-image: sdist
 	cat installer/openshift/Dockerfile | sed "s/{{ version }}/$(VERSION_TARGET)/g" | sed "s/{{ tar }}/$(SDIST_TAR_FILE)/g" > ./Dockerfile.production
-	cat installer/openshift/Dockerfile.celery | sed "s/{{ version }}/$(VERSION_TARGET)/g" | sed "s/{{ tar }}/$(SDIST_TAR_FILE)/g" > ./Dockerfile.celery.production
+	cp installer/openshift/Dockerfile.celery ./Dockerfile.celery.production
 	docker build -t awx_web -f ./Dockerfile.production .
 	docker build -t awx_task -f ./Dockerfile.celery.production .
 
diff --git a/installer/openshift/Dockerfile b/installer/openshift/Dockerfile
index 8c0109210e..627d5abfe2 100644
--- a/installer/openshift/Dockerfile
+++ b/installer/openshift/Dockerfile
@@ -32,10 +32,10 @@ RUN mkdir -p /var/log/tower
 RUN mkdir -p /etc/tower
 RUN echo "awxsecret" > /etc/tower/SECRET_KEY
 RUN VENV_BASE=/var/lib/awx/venv make requirements_ansible && VENV_BASE=/var/lib/awx/venv make requirements_awx
-COPY dist/awx-3.2.0.3953.tar.gz /tmp/awx-3.2.0.3953.tar.gz
-RUN OFFICIAL=yes pip install /tmp/awx-3.2.0.3953.tar.gz
+COPY dist/awx-{{ version }}.tar.gz /tmp/awx-{{ version }}.tar.gz
+RUN OFFICIAL=yes pip install /tmp/awx-{{ version }}.tar.gz
 
-RUN echo "3.2.0.3953" > /var/lib/awx/.tower_version
+RUN echo "{{ version }}" > /var/lib/awx/.tower_version
 ADD installer/openshift/nginx.conf /etc/nginx/nginx.conf
 ADD installer/openshift/supervisor.conf /supervisor.conf
 ADD installer/openshift/supervisor_task.conf /supervisor_task.conf