From ed79689bde3217e81f92d5e23fb054bf0271743b Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Sat, 26 Oct 2019 16:52:04 +0200
Subject: [PATCH] use docker images from RWTH GitLab registry
---
docker-compose.yml | 11 ++++++-----
kubernetes/backend-deployment.yaml | 2 +-
kubernetes/broker-deployment.yaml | 2 +-
kubernetes/controller-deployment.yaml | 2 +-
kubernetes/frontend-deployment.yaml | 2 +-
kubernetes/node-deployment.yaml | 23 +++++++++++++----------
kubernetes/relay-deployment.yaml | 14 +++++++-------
7 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index ba895a2..b3db1fa 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,14 +9,14 @@ volumes:
services:
# The VILLASweb frontend
frontend:
- image: villas/web-frontend:demo-v0.1
+ image: registry.git.rwth-aachen.de/acs/public/villas/web:demo-v0.1
build:
context: frontend
restart: always
# The VILLASweb backend
backend:
- image: villas/web-backend:demo-v0.1
+ image: registry.git.rwth-aachen.de/acs/public/villas/web-backend:demo-v0.1
build:
context: backend
environment:
@@ -54,7 +54,7 @@ services:
# VILLASnode, the gateway between UDP and WebSocket traffic
node:
- image: villas/node:demo-v0.1
+ image: registry.git.rwth-aachen.de/acs/public/villas/node:demo-v0.1
privileged: true
command: node /etc/villas/node/demo.conf
volumes:
@@ -68,7 +68,7 @@ services:
# A relay for websocket nodes
relay:
- image: villas/node:demo-v0.1
+ image: registry.git.rwth-aachen.de/acs/public/villas/node:demo-v0.1
restart: always
command: relay
@@ -89,7 +89,7 @@ services:
build:
context: .
dockerfile: Dockerfile.broker
- image: villas/broker:demo-v0.1
+ image: registry.git.rwth-aachen.de/acs/public/villas/demo/broker:demo-v0.1
environment:
RABBITMQ_DEFAULT_USER: "villas"
RABBITMQ_DEFAULT_PASS: "s3c0sim4!"
@@ -104,6 +104,7 @@ services:
build:
context: .
dockerfile: Dockerfile.controller
+ image: registry.git.rwth-aachen.de/acs/public/villas/controller:demo-v0.1
command: villas-ctl -b "amqp://villas:s3c0sim4!@broker/%2F" -c /etc/villas/controller/config.json daemon
volumes:
- ./etc/villas/controller:/etc/villas/controller
diff --git a/kubernetes/backend-deployment.yaml b/kubernetes/backend-deployment.yaml
index 375d894..4738c04 100644
--- a/kubernetes/backend-deployment.yaml
+++ b/kubernetes/backend-deployment.yaml
@@ -30,7 +30,7 @@ spec:
value: info
- name: NODE_ENV
value: dotenv
- image: villas/web-backend:demo-v0.1
+ image: registry.git.rwth-aachen.de/acs/public/villas/web-backend:demo-v0.1
name: backend
volumeMounts:
- mountPath: /usr/src/app/public/
diff --git a/kubernetes/broker-deployment.yaml b/kubernetes/broker-deployment.yaml
index fdb9210..f42a155 100644
--- a/kubernetes/broker-deployment.yaml
+++ b/kubernetes/broker-deployment.yaml
@@ -17,7 +17,7 @@ spec:
app.kubernetes.io/part-of: villas-controller
spec:
containers:
- - image: villas/broker:demo-v0.1
+ - image: registry.git.rwth-aachen.de/acs/public/villas/demo/broker:demo-v0.1
name: broker
env:
- name: RABBITMQ_NODE_PORT
diff --git a/kubernetes/controller-deployment.yaml b/kubernetes/controller-deployment.yaml
index f21468e..c146ca1 100644
--- a/kubernetes/controller-deployment.yaml
+++ b/kubernetes/controller-deployment.yaml
@@ -21,7 +21,7 @@ spec:
- -c
- /etc/villas/controller/config.json
- daemon
- image: villas/controller
+ image: registry.git.rwth-aachen.de/acs/public/villas/controller
name: controller
volumeMounts:
- mountPath: /etc/villas/controller/
diff --git a/kubernetes/frontend-deployment.yaml b/kubernetes/frontend-deployment.yaml
index 3ba858d..31fb77e 100644
--- a/kubernetes/frontend-deployment.yaml
+++ b/kubernetes/frontend-deployment.yaml
@@ -17,7 +17,7 @@ spec:
app.kubernetes.io/part-of: villas-web
spec:
containers:
- - image: villas/web-frontend:demo-v0.1
+ - image: registry.git.rwth-aachen.de/acs/public/villas/web:demo-v0.1
name: frontend
ports:
- name: http
diff --git a/kubernetes/node-deployment.yaml b/kubernetes/node-deployment.yaml
index c2b2b71..ff7b86d 100644
--- a/kubernetes/node-deployment.yaml
+++ b/kubernetes/node-deployment.yaml
@@ -16,10 +16,13 @@ spec:
app.kubernetes.io/component: node
spec:
containers:
- - args:
- - node
- - /etc/villas/node/demo.conf
- image: villas/node:demo-v0.1
+ - command: [ "sh", "-c" ]
+ args:
+ - "sleep 3600"
+ # args:
+ # - node
+ # - /etc/villas/node/demo.conf
+ image: registry.git.rwth-aachen.de/acs/public/villas/node:demo-v0.1
name: node
ports:
- containerPort: 80
@@ -52,12 +55,12 @@ spec:
name: config
- mountPath: /data
name: data
- livenessProbe:
- httpGet:
- path: /
- port: 80
- initialDelaySeconds: 3
- periodSeconds: 3
+ # livenessProbe:
+ # httpGet:
+ # path: /
+ # port: 80
+ # initialDelaySeconds: 5
+ # periodSeconds: 5
volumes:
- name: config
configMap:
diff --git a/kubernetes/relay-deployment.yaml b/kubernetes/relay-deployment.yaml
index 86b9e90..6ecff3a 100644
--- a/kubernetes/relay-deployment.yaml
+++ b/kubernetes/relay-deployment.yaml
@@ -19,14 +19,14 @@ spec:
containers:
- args:
- relay
- image: villas/node:demo-v0.1
+ image: registry.git.rwth-aachen.de/acs/public/villas/node:demo-v0.1
name: relay
ports:
- name: http
containerPort: 8088
- livenessProbe:
- httpGet:
- path: /
- port: 8088
- initialDelaySeconds: 3
- periodSeconds: 3
+ # livenessProbe:
+ # httpGet:
+ # path: /
+ # port: 8088
+ # initialDelaySeconds: 3
+ # periodSeconds: 3
--
GitLab