From 4a13b5c11e345e29d56c19802cacb60f49e62ce4 Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Fri, 4 Feb 2022 15:16:45 +0100
Subject: [PATCH] fix docker build
---
deploy/CMakeLists.txt | 1 +
.../{Dockerfile.template => Dockerfile} | 2 +-
deploy/asapo_services/{Dockerfile.template => Dockerfile.in} | 2 +-
monitoring/monitoring_server/CMakeLists.txt | 2 --
4 files changed, 3 insertions(+), 4 deletions(-)
rename deploy/asapo_orchestration_docker/{Dockerfile.template => Dockerfile} (64%)
rename deploy/asapo_services/{Dockerfile.template => Dockerfile.in} (72%)
diff --git a/deploy/CMakeLists.txt b/deploy/CMakeLists.txt
index 071ae9b20..739f85616 100644
--- a/deploy/CMakeLists.txt
+++ b/deploy/CMakeLists.txt
@@ -4,6 +4,7 @@ else()
SET (NOMAD_INSTALL ${CMAKE_INSTALL_PREFIX}/nomad_jobs)
endif()
+set (ASAPO_DOCKER_REPOSITORY yakser)
configure_files(${CMAKE_CURRENT_SOURCE_DIR}/asapo_services ${CMAKE_CURRENT_BINARY_DIR}/asapo_services)
configure_files(${CMAKE_CURRENT_SOURCE_DIR}/asapo_services/scripts ${CMAKE_CURRENT_BINARY_DIR}/asapo_services/scripts)
diff --git a/deploy/asapo_orchestration_docker/Dockerfile.template b/deploy/asapo_orchestration_docker/Dockerfile
similarity index 64%
rename from deploy/asapo_orchestration_docker/Dockerfile.template
rename to deploy/asapo_orchestration_docker/Dockerfile
index a3edfe710..87e56865c 100644
--- a/deploy/asapo_orchestration_docker/Dockerfile.template
+++ b/deploy/asapo_orchestration_docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM $ASAPO_DOCKER_REPOSITORY/asapo-nomad-cluster
+FROM yakser/asapo-nomad-cluster
MAINTAINER DESY IT
diff --git a/deploy/asapo_services/Dockerfile.template b/deploy/asapo_services/Dockerfile.in
similarity index 72%
rename from deploy/asapo_services/Dockerfile.template
rename to deploy/asapo_services/Dockerfile.in
index 8a01f49f1..cc8861862 100644
--- a/deploy/asapo_services/Dockerfile.template
+++ b/deploy/asapo_services/Dockerfile.in
@@ -1,4 +1,4 @@
-FROM $ASAPO_DOCKER_REPOSITORY/asapo-nomad-cluster
+FROM @ASAPO_DOCKER_REPOSITORY@/asapo-nomad-cluster
MAINTAINER DESY IT
diff --git a/monitoring/monitoring_server/CMakeLists.txt b/monitoring/monitoring_server/CMakeLists.txt
index 4763bb434..7f0ef4ed1 100644
--- a/monitoring/monitoring_server/CMakeLists.txt
+++ b/monitoring/monitoring_server/CMakeLists.txt
@@ -6,8 +6,6 @@ ELSE()
set (exe_name "${TARGET_NAME}")
ENDIF()
-configure_file(docker/Dockerfile docker/Dockerfile COPYONLY)
-
add_custom_target(${TARGET_NAME} ALL
COMMAND go build ${GO_OPTS} -o ${CMAKE_CURRENT_BINARY_DIR}/${exe_name} main/main.go
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/asapo_monitoring_server
--
GitLab