feat: run entrypoint as s6 supervised service

Signed-off-by: Matt Riben <matt.riben@swirldslabs.com>
hashgraph · Oct 10, 2024 · 818a5f5 · 818a5f5
1 parent 872ca1a
commit 818a5f5
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 1 deletion.
diff --git a/hedera-node/infrastructure/docker/containers/production-next/consensus-node/Dockerfile b/hedera-node/infrastructure/docker/containers/production-next/consensus-node/Dockerfile
@@ -238,6 +238,9 @@ COPY sdk/data/lib/* /opt/hgcapp/services-hedera/HapiApp2.0/data/lib/
 # Add the entrypoint script
 ADD entrypoint.sh /opt/hgcapp/services-hedera/HapiApp2.0/
 
+# Add s6-rc configuration
+COPY etc/s6-overlay/s6-rc.d /etc/s6-overlay/s6-rc.d/
+
 # Ensure proper file permissions
 RUN chmod -R +x /opt/hgcapp/services-hedera/HapiApp2.0/entrypoint.sh && \
     chown -R 2000:2000 /opt/hgcapp/services-hedera/HapiApp2.0
@@ -294,4 +297,3 @@ EXPOSE 50111/tcp 50211/tcp 50212/tcp
 USER 2000
 WORKDIR "/opt/hgcapp"
 ENTRYPOINT ["/init"]
-CMD ["/opt/hgcapp/services-hedera/HapiApp2.0/entrypoint.sh"]
diff --git a/...ntainers/production-next/consensus-node/etc/s6-overlay/s6-rc.d/hedera/dependencies.d/base b/...ntainers/production-next/consensus-node/etc/s6-overlay/s6-rc.d/hedera/dependencies.d/base
diff --git a/...cture/docker/containers/production-next/consensus-node/etc/s6-overlay/s6-rc.d/hedera/type b/...cture/docker/containers/production-next/consensus-node/etc/s6-overlay/s6-rc.d/hedera/type
@@ -0,0 +1 @@
+oneshot
diff --git a/...ructure/docker/containers/production-next/consensus-node/etc/s6-overlay/s6-rc.d/hedera/up b/...ructure/docker/containers/production-next/consensus-node/etc/s6-overlay/s6-rc.d/hedera/up
@@ -0,0 +1 @@
+/opt/hgcapp/services-hedera/HapiApp2.0/entrypoint.sh
diff --git a/...r/containers/production-next/consensus-node/etc/s6-overlay/s6-rc.d/user/contents.d/hedera b/...r/containers/production-next/consensus-node/etc/s6-overlay/s6-rc.d/user/contents.d/hedera
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		/opt/hgcapp/services-hedera/HapiApp2.0/entrypoint.sh