From 0ac2c26b32b06db7755b6eb855dc8ac7d0fe00ae Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Thu, 11 Feb 2016 06:20:23 +0000
Subject: [PATCH] Task #9048: Renamed template -> docker-template
---
Docker/CMakeLists.txt | 12 ++++++------
Docker/docker-build-all.sh | 2 +-
Docker/{template => docker-template} | 0
3 files changed, 7 insertions(+), 7 deletions(-)
rename Docker/{template => docker-template} (100%)
diff --git a/Docker/CMakeLists.txt b/Docker/CMakeLists.txt
index 7d03378f78f..060eea1d0c4 100644
--- a/Docker/CMakeLists.txt
+++ b/Docker/CMakeLists.txt
@@ -15,9 +15,9 @@ lofar_add_bin_program(versiondocker versiondocker.cc)
#
# For given directories, we generate the Dockerfile
-# by parsing their Dockerfile.tmpl through "template".
+# by parsing their Dockerfile.tmpl through "docker-template".
#
-# "template" is a script that fills in variables with
+# "docker-template" is a script that fills in variables with
# respect to the build info (branch name, build time, etc)
#
@@ -27,9 +27,9 @@ set(DOCKER_TEMPLATE_DIRS
lofar-pipeline
lofar-outputproc)
-# Note: "template" only works as long as the sources are still around,
+# Note: "docker-template" only works as long as the sources are still around,
# since it uses svn to query information from them.
-lofar_add_bin_scripts(template)
+lofar_add_bin_scripts(docker-template)
lofar_add_sbin_scripts(docker-build-all.sh)
# Convert Dockerfile.tmpl -> Dockerfile in ${DOCKER_TEMPLATE_DIRS}
@@ -42,8 +42,8 @@ foreach(_dir ${DOCKER_TEMPLATE_DIRS})
# when "all" is build.
add_custom_command(
OUTPUT ${_dst}
- COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/template < ${_src} > ${_dst}
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/template ${_src} ${CMAKE_CURRENT_BINARY_DIR}/versiondocker
+ COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/docker-template < ${_src} > ${_dst}
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/docker-template ${_src} ${CMAKE_CURRENT_BINARY_DIR}/versiondocker
)
add_custom_target(${_dir}_Dockerfile_target ALL DEPENDS ${_dst})
diff --git a/Docker/docker-build-all.sh b/Docker/docker-build-all.sh
index c242bb98556..71eb409a42c 100755
--- a/Docker/docker-build-all.sh
+++ b/Docker/docker-build-all.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-TAG=`echo '${LOFAR_TAG}' | template`
+TAG=`echo '${LOFAR_TAG}' | docker-template`
function build {
IMAGE=$1
diff --git a/Docker/template b/Docker/docker-template
similarity index 100%
rename from Docker/template
rename to Docker/docker-template
--
GitLab