Commit ece745c1 authored by Elisabetta Giani's avatar Elisabetta Giani
Browse files

AT5-259: changes to build the csp-lmc-common image.

parent 6248e3df

csp-lmc-common/docker/Dockerfile

+2 −1
Original line number Diff line number Diff line
@@ -7,4 +7,5 @@ RUN ipython profile create 
USER root

RUN DEBIAN_FRONTEND=noninteractive pip3 install https://nexus.engageska-portugal.pt/repository/pypi/packages/lmcbaseclasses/0.2.0+6bb55a6e/lmcbaseclasses-0.2.0+6bb55a6e.tar.gz



CMD ["/venv/bin/python", "-m"," csp_lmc_common.CspMaster" ]
 
RUN DEBIAN_FRONTEND=noninteractive pip3 install http://www.arcetri.astro.it/~egiani/csp-lmc-common-0.3.0.tar.gz

CMD ["/venv/bin/python", "/app/csp_lmc_common/CspMaster.py" ]

csp-lmc-mid/docker/.make/Makefile.mk

+1 −5
Original line number Diff line number Diff line
@@ -63,11 +63,7 @@ pre-push: 


post-push:



#docker-build: .release

docker-build: 

	@echo "$(PWD)"

	rm  $(PWD)/.release

	$(PWD)/scripts/kat-get-version.py > .release

docker-build: .release

	@echo "Building image: $(IMAGE):$(VERSION)"

	@echo "NAME: $(NAME)"

	docker build $(DOCKER_BUILD_ARGS) -t $(IMAGE):$(VERSION) $(DOCKER_BUILD_CONTEXT) -f $(DOCKER_FILE_PATH) --build-arg DOCKER_REGISTRY_HOST=$(DOCKER_REGISTRY_HOST) --build-arg DOCKER_REGISTRY_USER=$(DOCKER_REGISTRY_USER)

csp-lmc-mid/docker/.release

+22 −4
Original line number Diff line number Diff line 
UFFA

0.1.dev28+at5.262.b2479f2.dirty

AT5.262

None
 
# -*- coding: utf-8 -*-

#

# This file is part of the CSP.LMC prototype project

#

#

# Distributed under the terms of the BSD-3-Clause license.

# See LICENSE.txt for more info.



"""Release information for Python Package"""



name = """MID CSP.LMC"""

version = "0.3.0"

version_info = version.split(".")

description = """SKA MID CSP.LMC Classes"""

author = "E.G"

author_email = "elisabetta.giani@inaf.it"

license = """BSD-3-Clause"""

url = """www.tango-controls.org"""

copyright = """"""



release=0.3.0

tag=mid-csp-lmc-0.3.0

csp-lmc-mid/docker/mid-cbf-mcs.yml

+3 −2
Original line number Diff line number Diff line
@@ -251,7 +251,8 @@ services: 
    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}tmcspsubarrayleafnodetest

    depends_on:

      - cspmaster

      - midcspmaster

      - midcspsubarray01

      - databaseds

      - rsyslog-cbf

    environment:
@@ -268,7 +269,7 @@ services: 
    network_mode: ${NETWORK_MODE}

    container_name: ${CONTAINER_NAME_PREFIX}tmcspsubarrayleafnodetest2

    depends_on:

      - cspmaster

      - midcspmaster

      - databaseds

      - rsyslog-cbf

    environment: