a few more minor fixups for docker 0.10 and syntax

gregkh · May 7, 2014 · 885c071 · 885c071
1 parent 0f0f13d
commit 885c071
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/scripts/test_stable/test_stable_docker b/scripts/test_stable/test_stable_docker
@@ -192,10 +192,9 @@ __EOF__
 
 # create the Dockerfile
 cat <<__EOF__ > ${SCRIPT_HOME}/Dockerfile
-FROM lf/herlo/fedora:20
+FROM herlo_lf/fedora:20
 MAINTAINER Clint Savage <herlo@linuxfoundation.org>
 
-ADD /stable_queue.tar.gz ${REMOTE_DIR}/stable_queue.tar.gz
 
 ADD /ktest/ktest.conf ${REMOTE_DIR}/ktest.conf
 ADD /ktest/ktest.pl ${REMOTE_DIR}/ktest.pl
@@ -204,18 +203,20 @@ RUN chmod +x ${REMOTE_DIR}/ktest.pl
 ADD /run_test.sh ${REMOTE_DIR}/run_test.sh
 RUN chmod +x ${REMOTE_DIR}/run_test.sh
 
-RUN echo "alias run_test=${REMOTE_DIR}/run_test.sh \> ${REMOTE_DIR}/output_log" >> ${REMOTE_DIR}/.bashrc
+ADD /stable_queue.tar.gz ${SCRIPT_HOME}/stable_queue.tar.gz
+
+RUN echo "alias run_test=${REMOTE_DIR}/run_test.sh > ${REMOTE_DIR}/output_log" >> ${REMOTE_DIR}/.bashrc
 RUN source "${REMOTE_DIR}/.bashrc"
 
 __EOF__
 
 pushd ${SCRIPT_HOME} &> /dev/null
 DATE=$(date +%Y%m%d%H%M)
-${DOCKER} build -t lf/kernel-test:${DATE} ${SCRIPT_HOME}
+${DOCKER} build -t lf_kernel-test:${DATE} ${SCRIPT_HOME}
 
 echo "Running docker build lf/kernel-test:${DATE}"
 
-#${DOCKER} run -i -t -v ${LINUX_STABLE_DIR}:${LINUX_STABLE_DIR}:ro lf/kernel-test:${DATE} "${REMOTE_DIR}/run_test.sh" > ${REMOTE_DIR}/output_log
+echo ${DOCKER} run --rm -i -t -v ${LINUX_STABLE_DIR}:${LINUX_STABLE_DIR}:ro lf_kernel-test:${DATE} "${REMOTE_DIR}/run_test.sh" > ${REMOTE_DIR}/output_log
 
 popd &> /dev/null