Commit c6fbd534 authored by nanahira's avatar nanahira

fix some image tags

parent 41faf266
...@@ -45,6 +45,14 @@ class InventoryBuilder { ...@@ -45,6 +45,14 @@ class InventoryBuilder {
this.resolver.setServers(process.env.DNS ? [process.env.DNS] : ['114.114.114.114', '223.5.5.5']); this.resolver.setServers(process.env.DNS ? [process.env.DNS] : ['114.114.114.114', '223.5.5.5']);
} }
getDockerImageTag(host: any) {
if (host.arch && host.arch.length) {
return `:master-${host.arch}`;
} else {
return '';
}
}
async resolveDomain(domain: string, ipv6: boolean) { async resolveDomain(domain: string, ipv6: boolean) {
if (!domain || domain.match(/(\d{1,3}\.){3}\d{1,3}/)) { if (!domain || domain.match(/(\d{1,3}\.){3}\d{1,3}/)) {
return domain; return domain;
...@@ -220,7 +228,7 @@ class InventoryBuilder { ...@@ -220,7 +228,7 @@ class InventoryBuilder {
services: { services: {
'gateways-monitor': { 'gateways-monitor': {
restart: 'always', restart: 'always',
image: 'git-registry.mycard.moe/railgun/gateways-monitor', image: `git-registry.mycard.moe/railgun/gateways-monitor${this.getDockerImageTag(host)}`,
network_mode: 'host', network_mode: 'host',
cap_add: ['NET_ADMIN'], cap_add: ['NET_ADMIN'],
volumes: ['./route-plans:/usr/src/app/route-plans:ro'], volumes: ['./route-plans:/usr/src/app/route-plans:ro'],
...@@ -231,7 +239,7 @@ class InventoryBuilder { ...@@ -231,7 +239,7 @@ class InventoryBuilder {
if (!host.sysBird) { if (!host.sysBird) {
host.dockerServices.services.babeld = { host.dockerServices.services.babeld = {
restart: 'always', restart: 'always',
image: 'git-registry.mycard.moe/railgun/babeld', image: `git-registry.mycard.moe/railgun/babeld${this.getDockerImageTag(host)}`,
network_mode: 'host', network_mode: 'host',
//cap_add: ['NET_ADMIN'], //cap_add: ['NET_ADMIN'],
privileged: true, privileged: true,
...@@ -391,7 +399,7 @@ class InventoryBuilder { ...@@ -391,7 +399,7 @@ class InventoryBuilder {
local.ocMetric = metric; local.ocMetric = metric;
local.dockerServices.services.ocserv = { local.dockerServices.services.ocserv = {
restart: 'always', restart: 'always',
image: 'git-registry.mycard.moe/nanahira/docker-ocserv', image: `git-registry.mycard.moe/nanahira/docker-ocserv${this.getDockerImageTag(local)}`,
network_mode: 'host', network_mode: 'host',
command: 'ocserv -f -d 1', command: 'ocserv -f -d 1',
cap_add: ['NET_ADMIN'], cap_add: ['NET_ADMIN'],
...@@ -422,7 +430,7 @@ class InventoryBuilder { ...@@ -422,7 +430,7 @@ class InventoryBuilder {
const containerName = `openconnect-${name}`; const containerName = `openconnect-${name}`;
local.dockerServices.services[containerName] = { local.dockerServices.services[containerName] = {
restart: 'always', restart: 'always',
image: 'git-registry.mycard.moe/railgun/openconnect', image: `git-registry.mycard.moe/railgun/openconnect${this.getDockerImageTag(local)}`,
network_mode: 'host', network_mode: 'host',
command: ['bash', '-c', startupCommand], command: ['bash', '-c', startupCommand],
cap_add: ['NET_ADMIN'], cap_add: ['NET_ADMIN'],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment