update deb to use IMAGE_SRC

calaos · Dec 14, 2023 · 4bbe3b8 · 4bbe3b8
1 parent cc41437
commit 4bbe3b8
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 14 deletions.
diff --git a/calaos-home/Makefile b/calaos-home/Makefile
@@ -11,7 +11,7 @@ all: build
 build:
 	@echo "Building package $(VERSION)"
 	@echo "Using image: $(IMAGE_SRC)"
-	@echo "$(IMAGE_SRC)" > $(TOP_DIR)/container.source
+	@echo "IMAGE_SRC=$(IMAGE_SRC)" > $(TOP_DIR)/container.source
 
 clean:
 	@rm -rf $(TOP_DIR)/pkg $(TOP_DIR)/build \

diff --git a/calaos-home/debian/calaos-home.service b/calaos-home/debian/calaos-home.service
@@ -16,6 +16,7 @@ Delegate=yes
 Type=notify
 NotifyAccess=all
 SyslogIdentifier=%N
+EnvironmentFile=/usr/share/calaos/calaos-home.source
 
 ExecStart=/usr/sbin/start_calaos_home %t/%N.cid
 

diff --git a/calaos-home/start_calaos_home b/calaos-home/start_calaos_home
@@ -59,5 +59,5 @@ podman run \
         --mount type=bind,source=/run/udev/data,target=/run/udev/data,readonly \
         $(append_gpu_opts) \
         $(append_input_opts) \
-        ghcr.io/calaos/calaos_home:latest \
+        ${IMAGE_SRC} \
         /usr/bin/start.sh
diff --git a/calaos-server/Makefile b/calaos-server/Makefile
@@ -11,7 +11,7 @@ all: build
 build:
 	@echo "Building package: $(VERSION)"
 	@echo "Using image: $(IMAGE_SRC)"
-	@echo "$(IMAGE_SRC)" > $(TOP_DIR)/container.source
+	@echo "IMAGE_SRC=$(IMAGE_SRC)" > $(TOP_DIR)/container.source
 
 clean:
 	@rm -rf $(TOP_DIR)/pkg $(TOP_DIR)/build \

diff --git a/calaos-server/debian/calaos-server.service b/calaos-server/debian/calaos-server.service
@@ -16,6 +16,8 @@ Delegate=yes
 Type=notify
 NotifyAccess=all
 SyslogIdentifier=%N
+EnvironmentFile=/usr/share/calaos/calaos-server.source
+
 ExecStart=/usr/bin/podman run \
         --name=calaos-server \
         --cidfile=%t/%N.cid --replace --rm --cgroups=split --tz=local \
@@ -28,7 +30,7 @@ ExecStart=/usr/bin/podman run \
         --pull=never \
         --replace \
         --tz=local \
-        ghcr.io/calaos/calaos_base \
+        ${IMAGE_SRC} \
         /opt/bin/calaos_server
 
 [Install]

diff --git a/grafana/Makefile b/grafana/Makefile
@@ -11,7 +11,7 @@ all: build
 build:
 	@echo "Building package $(VERSION)"
 	@echo "Using image: $(IMAGE_SRC)"
-	@echo "$(IMAGE_SRC)" > $(TOP_DIR)/container.source
+	@echo "IMAGE_SRC=$(IMAGE_SRC)" > $(TOP_DIR)/container.source
 
 clean:
 	@rm -rf $(TOP_DIR)/pkg $(TOP_DIR)/build \

diff --git a/grafana/debian/grafana.service b/grafana/debian/grafana.service
@@ -16,6 +16,8 @@ Delegate=yes
 Type=notify
 NotifyAccess=all
 SyslogIdentifier=%N
+EnvironmentFile=/usr/share/calaos/calaos-grafana.source
+
 ExecStart=/usr/bin/podman run \
         --name=grafana \
         --cidfile=%t/%N.cid --replace --rm --cgroups=split --tz=local \
@@ -25,7 +27,7 @@ ExecStart=/usr/bin/podman run \
         --pull=never \
         --replace \
         --tz=local \
-        docker.io/grafana/grafana-oss
+        ${IMAGE_SRC}
 
 [Install]
 WantedBy=multi-user.target
diff --git a/haproxy/Makefile b/haproxy/Makefile
@@ -11,7 +11,7 @@ all: build
 build:
 	@echo "Building package $(VERSION)"
 	@echo "Using image: $(IMAGE_SRC)"
-	@echo "$(IMAGE_SRC)" > $(TOP_DIR)/container.source
+	@echo "IMAGE_SRC=$(IMAGE_SRC)" > $(TOP_DIR)/container.source
 
 clean:
 	@rm -rf $(TOP_DIR)/pkg $(TOP_DIR)/build \

diff --git a/haproxy/debian/haproxy.service b/haproxy/debian/haproxy.service
@@ -17,6 +17,8 @@ Delegate=yes
 Type=notify
 NotifyAccess=all
 SyslogIdentifier=%N
+EnvironmentFile=/usr/share/calaos/calaos-haproxy.source
+
 ExecStart=/usr/bin/podman run \
         --name=haproxy \
         --cidfile=%t/%N.cid --replace --rm --cgroups=split --tz=local \
@@ -27,7 +29,7 @@ ExecStart=/usr/bin/podman run \
         --replace \
         --tz=local \
         --cap-add=CAP_NET_BIND_SERVICE \
-        docker.io/haproxy
+        ${IMAGE_SRC}
 
 [Install]
 WantedBy=multi-user.target
diff --git a/influxdb/Makefile b/influxdb/Makefile
@@ -11,7 +11,7 @@ all: build
 build:
 	@echo "Building package $(VERSION)"
 	@echo "Using image: $(IMAGE_SRC)"
-	@echo "$(IMAGE_SRC)" > $(TOP_DIR)/container.source
+	@echo "IMAGE_SRC=$(IMAGE_SRC)" > $(TOP_DIR)/container.source
 
 clean:
 	@rm -rf $(TOP_DIR)/pkg $(TOP_DIR)/build \

diff --git a/influxdb/debian/influxdb.service b/influxdb/debian/influxdb.service
@@ -16,6 +16,8 @@ Delegate=yes
 Type=notify
 NotifyAccess=all
 SyslogIdentifier=%N
+EnvironmentFile=/usr/share/calaos/calaos-influxdb.source
+
 ExecStart=/usr/bin/podman run \
         --name=influxdb \
         --cidfile=%t/%N.cid --replace --rm --cgroups=split --tz=local \
@@ -26,7 +28,7 @@ ExecStart=/usr/bin/podman run \
         --pull=never \
         --replace \
         --tz=local \
-        docker.io/influxdb
+        ${IMAGE_SRC}
 
 [Install]
 WantedBy=multi-user.target
diff --git a/mosquitto/Makefile b/mosquitto/Makefile
@@ -11,7 +11,7 @@ all: build
 build:
 	@echo "Building package $(VERSION)"
 	@echo "Using image: $(IMAGE_SRC)"
-	@echo "$(IMAGE_SRC)" > $(TOP_DIR)/container.source
+	@echo "IMAGE_SRC=$(IMAGE_SRC)" > $(TOP_DIR)/container.source
 
 clean:
 	@rm -rf $(TOP_DIR)/pkg $(TOP_DIR)/build \

diff --git a/mosquitto/debian/mosquitto.service b/mosquitto/debian/mosquitto.service
@@ -17,6 +17,8 @@ Delegate=yes
 Type=notify
 NotifyAccess=all
 SyslogIdentifier=%N
+EnvironmentFile=/usr/share/calaos/calaos-mosquitto.source
+
 ExecStart=/usr/bin/podman run \
         --name=mosquitto \
         --cidfile=%t/%N.cid --replace --rm --cgroups=split --tz=local \
@@ -27,7 +29,7 @@ ExecStart=/usr/bin/podman run \
         --pull=never \
         --replace \
         --tz=local \
-        docker.io/eclipse-mosquitto
+        ${IMAGE_SRC}
 
 [Install]
 WantedBy=multi-user.target
diff --git a/zigbee2mqtt/Makefile b/zigbee2mqtt/Makefile
@@ -11,7 +11,7 @@ all: build
 build:
 	@echo "Building package $(VERSION)"
 	@echo "Using image: $(IMAGE_SRC)"
-	@echo "$(IMAGE_SRC)" > $(TOP_DIR)/container.source
+	@echo "IMAGE_SRC=$(IMAGE_SRC)" > $(TOP_DIR)/container.source
 
 clean:
 	@rm -rf $(TOP_DIR)/pkg $(TOP_DIR)/build \

diff --git a/zigbee2mqtt/debian/zigbee2mqtt.service b/zigbee2mqtt/debian/zigbee2mqtt.service
@@ -18,6 +18,7 @@ Type=notify
 NotifyAccess=all
 SyslogIdentifier=%N
 ExecStart=/usr/sbin/start_z2mqtt %t/%N.cid
+EnvironmentFile=/usr/share/calaos/calaos-Zigbee2mqtt.source
 
 [Install]
 WantedBy=multi-user.target
diff --git a/zigbee2mqtt/start_z2mqtt b/zigbee2mqtt/start_z2mqtt
@@ -36,4 +36,4 @@ podman run \
         --replace \
         --tz=local \
         $(append_dev_opts) \
-        docker.io/koenkk/zigbee2mqtt
+        ${IMAGE_SRC}