Skip to content
Snippets Groups Projects
Commit 2a455be8 authored by Matteo04052017's avatar Matteo04052017
Browse files

ST-205: add docker image for dsconfig

parent a2113e18
Branches
No related tags found
No related merge requests found
...@@ -89,6 +89,21 @@ build_tango-java: ...@@ -89,6 +89,21 @@ build_tango-java:
- docker/tango/tango-dependencies/**/* - docker/tango/tango-dependencies/**/*
- docker/tango/tango-java/**/* - docker/tango/tango-java/**/*
build_tango-dsconfig:
retry: 2
stage: build_3
tags:
- docker-executor
script:
- cd docker/tango/tango-dsconfig
- make DOCKER_BUILD_ARGS="--no-cache" DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST build
- make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST push
only:
changes:
- docker/tango/tango-dependencies/**/*
- docker/tango/tango-cpp/**/*
- docker/tango/tango-dsconfig/**/*
build_ska-python-buildenv: build_ska-python-buildenv:
retry: 2 retry: 2
stage: build_3 stage: build_3
......
...@@ -81,6 +81,14 @@ delete: ## delete the helm chart release (with Tiller) ...@@ -81,6 +81,14 @@ delete: ## delete the helm chart release (with Tiller)
@helm tiller run $(KUBE_NAMESPACE) -- helm delete $(HELM_RELEASE) --purge \ @helm tiller run $(KUBE_NAMESPACE) -- helm delete $(HELM_RELEASE) --purge \
--tiller-namespace $(KUBE_NAMESPACE) --tiller-namespace $(KUBE_NAMESPACE)
delete_template: ## delete the helm chart release
@helm template ska-docker/ --name $(HELM_RELEASE) \
--namespace $(KUBE_NAMESPACE) \
--tiller-namespace $(KUBE_NAMESPACE) \
--set display="$(DISPLAY)" \
--set xauthority="$(XAUTHORITYx)" \
--set tangoexample.debug="$(REMOTE_DEBUG)" | kubectl -n $(KUBE_NAMESPACE) delete -f -
tests: ## run Helm chart tests tests: ## run Helm chart tests
@helm tiller run $(KUBE_NAMESPACE) -- helm test $(HELM_RELEASE) --cleanup @helm tiller run $(KUBE_NAMESPACE) -- helm test $(HELM_RELEASE) --cleanup
......
release=0.1.0
tag=tango-dsconfig-0.1.0
ARG DOCKER_REGISTRY_USER
ARG DOCKER_REGISTRY_HOST
FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:latest
USER root
# Speed up image builds by adding apt proxy if detected on host
RUN DOCKERHOST=`awk '/^[a-z]+[0-9]+\t00000000/ { printf("%d.%d.%d.%d", "0x" substr($3, 7, 2), "0x" substr($3, 5, 2), "0x" substr($3, 3, 2), "0x" substr($3, 1, 2)) }' < /proc/net/route` \
&& /usr/local/bin/wait-for-it.sh --host=$DOCKERHOST --port=3142 --timeout=3 --strict --quiet -- echo "Acquire::http::Proxy \"http://$DOCKERHOST:3142\";" > /etc/apt/apt.conf.d/30proxy \
&& echo "Proxy detected on docker host - using for this build" || echo "No proxy detected on docker host"
# Install build dependencies:
#
# * build-essential installs C/C++ compilers and build tools
# * libboost-python-dev is required to bind PyTango to the C++ Tango libs
# * pkg-config is used to locate required libraries
# * virtualenv is required to create a new Python virtualenv environment
#
RUN buildDeps='build-essential \
libboost-python-dev \
pkg-config \
git \
python-setuptools \
python-pip \
virtualenv' \
&& DEBIAN_FRONTEND=noninteractive apt-get update \
&& apt-get -y install --no-install-recommends $buildDeps
RUN pip install wheel
RUN pip install --no-cache-dir --extra-index-url=https://pypi.org/simple -i https://nexus.engageska-portugal.pt/repository/pypi/simple python-dsconfig==1.2.5
\ No newline at end of file
include ../../make/Makefile
pre-build:
@echo do some stuff before the docker build
post-build:
@echo do some stuff after the docker build
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment