Skip to content
Snippets Groups Projects
Commit cb208433 authored by Matteo Di Carlo's avatar Matteo Di Carlo
Browse files

Resolve ST-515 "Bug fixing for and docker images creation"

parent 462984f5
Branches
No related tags found
No related merge requests found
Showing
with 36 additions and 36 deletions
...@@ -2,12 +2,12 @@ apiVersion: v2 ...@@ -2,12 +2,12 @@ apiVersion: v2
appVersion: "1.0" appVersion: "1.0"
description: A Helm chart for deploying the HDB++ archiver for the MVP on Kubernetes description: A Helm chart for deploying the HDB++ archiver for the MVP on Kubernetes
name: archiver name: archiver
version: 0.2.4 version: 0.2.5
appVersion: 1.16.0 appVersion: 1.16.0
icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
dependencies: dependencies:
- name: tango-util - name: tango-util
version: 0.2.2 version: 0.2.3
repository: file://../tango-util repository: file://../tango-util
# The archiver cannot have the tango-base since we allow only one level in the chart hierarchies # The archiver cannot have the tango-base since we allow only one level in the chart hierarchies
# - name: tango-base # - name: tango-base
......
...@@ -2,14 +2,14 @@ apiVersion: v2 ...@@ -2,14 +2,14 @@ apiVersion: v2
appVersion: "1.0" appVersion: "1.0"
description: A Helm chart for deploying the TANGO base system on Kubernetes description: A Helm chart for deploying the TANGO base system on Kubernetes
name: ska-docker name: ska-docker
version: 0.1.5 version: 0.1.6
icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
dependencies: dependencies:
- name: tango-base - name: tango-base
version: 0.2.5 version: 0.2.6
repository: file://../tango-base repository: file://../tango-base
condition: tango-base.enabled,global.sub-system.tango-base.enabled condition: tango-base.enabled,global.sub-system.tango-base.enabled
- name: archiver - name: archiver
version: 0.2.4 version: 0.2.5
repository: file://../archiver repository: file://../archiver
condition: archiver.enabled,global.sub-system.archiver.enabled condition: archiver.enabled,global.sub-system.archiver.enabled
...@@ -2,9 +2,9 @@ apiVersion: v2 ...@@ -2,9 +2,9 @@ apiVersion: v2
appVersion: "1.0" appVersion: "1.0"
description: A Helm chart for deploying the TANGO base system on Kubernetes description: A Helm chart for deploying the TANGO base system on Kubernetes
name: tango-base name: tango-base
version: 0.2.5 version: 0.2.6
icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
dependencies: dependencies:
- name: tango-util - name: tango-util
version: 0.2.2 version: 0.2.3
repository: file://../tango-util repository: file://../tango-util
\ No newline at end of file
...@@ -2,8 +2,8 @@ apiVersion: v2 ...@@ -2,8 +2,8 @@ apiVersion: v2
description: A Helm chart library of utilities for TANGO deployents description: A Helm chart library of utilities for TANGO deployents
name: tango-util name: tango-util
type: library type: library
appVersion: 0.2.2 appVersion: 0.2.3
version: 0.2.2 version: 0.2.3
icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
maintainers: maintainers:
- name: Matteo Di Carlo - name: Matteo Di Carlo
......
...@@ -13,11 +13,11 @@ ...@@ -13,11 +13,11 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: {{tpl (.deviceserver.name | toString) $chart }} name: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
namespace: {{ .local.Release.Namespace }} namespace: {{ .local.Release.Namespace }}
labels: labels:
{{ toYaml $labels | indent 4 }} {{ toYaml $labels | indent 4 }}
component: {{tpl (.deviceserver.name | toString) $chart }} component: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
function: {{ .deviceserver.function }} function: {{ .deviceserver.function }}
domain: {{ .deviceserver.domain }} domain: {{ .deviceserver.domain }}
subsystem: {{ .local.Values.subsystem }} subsystem: {{ .local.Values.subsystem }}
...@@ -26,18 +26,18 @@ metadata: ...@@ -26,18 +26,18 @@ metadata:
spec: spec:
selector: selector:
subsystem: {{ .local.Values.subsystem }} subsystem: {{ .local.Values.subsystem }}
component: {{tpl (.deviceserver.name | toString) $chart }} component: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
clusterIP: None clusterIP: None
--- ---
apiVersion: apps/v1 apiVersion: apps/v1
kind: StatefulSet kind: StatefulSet
metadata: metadata:
name: {{tpl (.deviceserver.name | toString) $chart }} name: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
namespace: {{ .local.Release.Namespace }} namespace: {{ .local.Release.Namespace }}
labels: labels:
{{ toYaml $labels | indent 4 }} {{ toYaml $labels | indent 4 }}
component: {{tpl (.deviceserver.name | toString) $chart }} component: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
function: {{ .deviceserver.function }} function: {{ .deviceserver.function }}
domain: {{ .deviceserver.domain }} domain: {{ .deviceserver.domain }}
subsystem: {{ .local.Values.subsystem }} subsystem: {{ .local.Values.subsystem }}
...@@ -46,14 +46,14 @@ metadata: ...@@ -46,14 +46,14 @@ metadata:
spec: spec:
selector: selector:
matchLabels: matchLabels:
component: {{tpl (.deviceserver.name | toString) $chart }} component: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
subsystem: {{ .local.Values.subsystem }} subsystem: {{ .local.Values.subsystem }}
serviceName: {{tpl (.deviceserver.name | toString) $chart }} serviceName: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
replicas: 1 replicas: 1
template: template:
metadata: metadata:
labels: labels:
component: {{tpl (.deviceserver.name | toString) $chart }} component: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
function: {{ .deviceserver.function }} function: {{ .deviceserver.function }}
domain: {{ .deviceserver.domain }} domain: {{ .deviceserver.domain }}
subsystem: {{ .local.Values.subsystem }} subsystem: {{ .local.Values.subsystem }}
...@@ -74,7 +74,7 @@ spec: ...@@ -74,7 +74,7 @@ spec:
- --timeout=60 - --timeout=60
- --strict - --strict
- -- - --
- echo databaseds ready - echo {{ $device.host }} ready
{{- if ($chart.Values.global.environment_variables) }} {{- if ($chart.Values.global.environment_variables) }}
env: env:
{{- range $index, $envvar := $chart.Values.global.environment_variables }} {{- range $index, $envvar := $chart.Values.global.environment_variables }}
......
ARG DOCKER_REGISTRY_USER ARG DOCKER_REGISTRY_USER
ARG DOCKER_REGISTRY_HOST ARG DOCKER_REGISTRY_HOST
FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:latest FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:9.3.3
USER root USER root
......
ARG DOCKER_REGISTRY_USER ARG DOCKER_REGISTRY_USER
ARG DOCKER_REGISTRY_HOST ARG DOCKER_REGISTRY_HOST
FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-db:latest FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-db:10.4.10
COPY resources/create_hdb++_mysql.sql docker-entrypoint-initdb.d/create_db.sql COPY resources/create_hdb++_mysql.sql docker-entrypoint-initdb.d/create_db.sql
COPY resources/my.cnf /etc/mysql/conf.d COPY resources/my.cnf /etc/mysql/conf.d
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
# #
ARG DOCKER_REGISTRY_USER ARG DOCKER_REGISTRY_USER
ARG DOCKER_REGISTRY_HOST ARG DOCKER_REGISTRY_HOST
FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:latest FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:9.3.4-rc7
USER root USER root
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
# #
ARG DOCKER_REGISTRY_USER ARG DOCKER_REGISTRY_USER
ARG DOCKER_REGISTRY_HOST ARG DOCKER_REGISTRY_HOST
FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-buildenv:latest as buildenv FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-buildenv:9.3.2.1 as buildenv
FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:latest FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:9.3.4-rc7
USER root USER root
# Permanently install Python and PyTango runtime dependencies: # Permanently install Python and PyTango runtime dependencies:
......
ARG DOCKER_REGISTRY_USER ARG DOCKER_REGISTRY_USER
ARG DOCKER_REGISTRY_HOST ARG DOCKER_REGISTRY_HOST
FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-libtango:latest FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-libtango:9.3.4-rc7
ENTRYPOINT ["/usr/local/bin/tango_admin"] ENTRYPOINT ["/usr/local/bin/tango_admin"]
......
ARG DOCKER_REGISTRY_USER ARG DOCKER_REGISTRY_USER
ARG DOCKER_REGISTRY_HOST ARG DOCKER_REGISTRY_HOST
FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:latest FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:9.3.4-rc7
USER root USER root
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# #
ARG DOCKER_REGISTRY_USER ARG DOCKER_REGISTRY_USER
ARG DOCKER_REGISTRY_HOST ARG DOCKER_REGISTRY_HOST
FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-dependencies:latest as buildenv FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-dependencies:9.3.3.1 as buildenv
RUN TANGO_DOWNLOAD_URL=https://nexus.engageska-portugal.pt/repository/raw/tango-cs/tango-9.3.4-rc7.tar.gz \ RUN TANGO_DOWNLOAD_URL=https://nexus.engageska-portugal.pt/repository/raw/tango-cs/tango-9.3.4-rc7.tar.gz \
# Speed up image builds by adding apt proxy if detected on host # Speed up image builds by adding apt proxy if detected on host
......
ARG DOCKER_REGISTRY_USER ARG DOCKER_REGISTRY_USER
ARG DOCKER_REGISTRY_HOST ARG DOCKER_REGISTRY_HOST
FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-libtango:latest FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-libtango:9.3.4-rc7
ENTRYPOINT ["/usr/local/bin/DataBaseds"] ENTRYPOINT ["/usr/local/bin/DataBaseds"]
......
release=9.3.3 release=9.3.3.1
tag=tango-dependencies-9.3.3 tag=tango-dependencies-9.3.3.1
...@@ -41,7 +41,7 @@ RUN CPPZMQ_DOWNLOAD_URL=https://github.com/zeromq/cppzmq/archive/v4.4.1.tar.gz \ ...@@ -41,7 +41,7 @@ RUN CPPZMQ_DOWNLOAD_URL=https://github.com/zeromq/cppzmq/archive/v4.4.1.tar.gz \
&& tar xf cppzmq.tar.gz -C /usr/src/cppzmq --strip-components=1 \ && tar xf cppzmq.tar.gz -C /usr/src/cppzmq --strip-components=1 \
&& mkdir build \ && mkdir build \
&& cd build \ && cd build \
&& cmake .. \ && cmake -DCPPZMQ_BUILD_TESTS=OFF .. \
&& make -j4 install \ && make -j4 install \
&& apt-get purge -y --auto-remove $buildDeps \ && apt-get purge -y --auto-remove $buildDeps \
&& rm -r /usr/src/cppzmq && rm -r /usr/src/cppzmq
......
ARG DOCKER_REGISTRY_USER ARG DOCKER_REGISTRY_USER
ARG DOCKER_REGISTRY_HOST ARG DOCKER_REGISTRY_HOST
FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:latest FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:9.3.4-rc7
USER root USER root
......
ARG DOCKER_REGISTRY_USER ARG DOCKER_REGISTRY_USER
ARG DOCKER_REGISTRY_HOST ARG DOCKER_REGISTRY_HOST
FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-buildenv:latest as buildenv FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-buildenv:9.3.2.1 as buildenv
FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-runtime:latest FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-runtime:9.3.2.1
# create ipython profile to so that itango doesn't fail if ipython hasn't run yet # create ipython profile to so that itango doesn't fail if ipython hasn't run yet
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# #
ARG DOCKER_REGISTRY_USER ARG DOCKER_REGISTRY_USER
ARG DOCKER_REGISTRY_HOST ARG DOCKER_REGISTRY_HOST
FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-dependencies:latest FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-dependencies:9.3.3.1
RUN JAVA_DOWNLOAD_URL=https://nexus.engageska-portugal.pt/repository/raw/java/jre-8u221-linux-x64.tar.gz \ RUN JAVA_DOWNLOAD_URL=https://nexus.engageska-portugal.pt/repository/raw/java/jre-8u221-linux-x64.tar.gz \
&& mkdir /usr/java \ && mkdir /usr/java \
......
ARG DOCKER_REGISTRY_USER ARG DOCKER_REGISTRY_USER
ARG DOCKER_REGISTRY_HOST ARG DOCKER_REGISTRY_HOST
FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:9.3.3
ENTRYPOINT ["/usr/local/bin/jive"] ENTRYPOINT ["/usr/local/bin/jive"]
ARG DOCKER_REGISTRY_USER ARG DOCKER_REGISTRY_USER
ARG DOCKER_REGISTRY_HOST ARG DOCKER_REGISTRY_HOST
FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:9.3.4-rc7
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment