From 4c8d6c0f191dd644026817f9c6f41c0edafabee3 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sun, 16 May 2021 21:23:22 +0300
Subject: [PATCH] Set the hostname.
---
.gitlab-ci.yml | 6 ++++++
docker-compose.yml | 8 ++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f13b2d..db26e3d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,13 +47,19 @@ run-ns4:
extends: .compose-run
stage: deploy
tags: [ns4.shore.co.il]
+ variables:
+ HOSTNAME: ns4
run-host01:
extends: .compose-run
stage: deploy
tags: [host01.shore.co.il]
+ variables:
+ HOSTNAME: host01
run-kodi:
extends: .compose-run
stage: deploy
tags: [kodi.shore.co.il]
+ variables:
+ HOSTNAME: kodi
diff --git a/docker-compose.yml b/docker-compose.yml
index 1aee6f7..7cf42e2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,11 +4,12 @@ services:
filebeat:
build:
context: filebeat
+ domainname: &domainname "${HOSTNAME}.shore.co.il"
+ hostname: &hostname "${HOSTNAME}"
image: registry.shore.co.il/filebeat
restart: always
user: root
volumes:
- - /etc/hostname:/etc/hostname:ro
- filebeat:/usr/share/filebeat/data/
- /var/lib/docker/containers:/var/lib/docker/containers:ro
- /var/run/docker.sock:/var/run/docker.sock:ro
@@ -16,11 +17,12 @@ services:
journalbeat:
build:
context: journalbeat
+ domainname: *domainname
+ hostname: *hostname
image: registry.shore.co.il/journalbeat
restart: always
user: root
volumes:
- - /etc/hostname:/etc/hostname:ro
- journalbeat:/usr/share/journalbeat/data/
- /var/log/journal:/var/log/journal
- /etc/machine-id:/etc/machine-id:ro
@@ -34,7 +36,6 @@ services:
restart: always
user: root
volumes:
- - /etc/hostname:/etc/hostname:ro
- metricbeat:/usr/share/metricbeat/data/
- /var/run/docker.sock:/var/run/docker.sock:ro
- /sys/fs/cgroup:/hostfs/sys/fs/cgroup:ro
@@ -54,7 +55,6 @@ services:
network_mode: host
restart: always
volumes:
- - /etc/hostname:/etc/hostname:ro
- packetbeat:/usr/share/packetbeat/data/
volumes:
--
GitLab