getting postgres db working adding missing libs

NASA-AMMOS · May 9, 2024 · 5e69726 · 5e69726
1 parent 87a97af
commit 5e69726
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/ion/Dockerfile b/ion/Dockerfile
@@ -16,13 +16,12 @@
 ## limitations under the License.
 ##
 
-FROM anms-base AS ion-base
-
-RUN dnf -y install container-tools
-RUN dnf -y install  \
+FROM anms-init AS ion-base
+RUN dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
+RUN dnf install  -y  \
     autoconf libtool \
     cmake ninja-build \
-    ruby rsync  \
+    ruby rsync  git \
     systemd systemd-sysv \
     patch autoconf libtool \
     make gcc gcc-c++ libpq-devel \
@@ -32,7 +31,6 @@ RUN dnf -y install  \
     dnf clean all && rm -rf /var/cache/yum && \
     PERL_MM_USE_DEFAULT=1 cpan -T JSON REST::Client Expect File::Slurp
 
-
 COPY src/deps/ion /usr/src/nm/deps/ion
 COPY src/deps/ion*.patch /usr/src/nm/deps/
 RUN cd /usr/src/nm/deps/ion && \

diff --git a/ion/systemd/[email protected] b/ion/systemd/[email protected]
@@ -7,6 +7,7 @@ Requires=ion.service
 [Service]
 Type=simple
 PassEnvironment=ION_NODE_NUM
+EnvironmentFile=-/etc/ion/environment
 ExecStart=bpecho ipn:${ION_NODE_NUM}.%i
 
 [Install]

diff --git a/ion/systemd/ion-nm-agent.service b/ion/systemd/ion-nm-agent.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=ION NM Agent
 After=network-online.target ion.service ion-nm-mgr.service
-Wants=network-online.target
+Wants=network-online.target ion-nm-mgr.service
 Requires=ion.service
 
 [Service]

diff --git a/ion/systemd/ion-nm-mgr.service b/ion/systemd/ion-nm-mgr.service
@@ -9,7 +9,7 @@ Type=notify
 PassEnvironment=ION_NODE_NUM DB_HOST DB_NAME DB_USER DB_PASSWORD
 EnvironmentFile=-/etc/ion/environment
 ExecStart=ion_nm_wrap --listen /var/run/nm_mgr.socket -- \
-    ion_nm_mgr -A ipn:${ION_NODE_NUM}.7 \
+    ion_nm_mgr -A ipn:${ION_NODE_NUM}.7  \
     --sql-host ${DB_HOST} \
     --sql-db ${DB_NAME} \
     --sql-user ${DB_USER} \

diff --git a/ion/systemd/ion.service b/ion/systemd/ion.service
@@ -6,13 +6,12 @@ Wants=network-online.target
 [Service]
 Type=forking
 PassEnvironment=ION_NODE_NUM
-EnvironmentFile=-/etc/ion/environment
 # ION writes logs in the CWD
 WorkingDirectory=/var/run/ion
 ExecStartPre=touch ion.log
 ExecStartPre=chmod 666 ion.log
 # Substitute node number where necessary
-ExecStartPre=sed -i s/@ION_NODE_NUM@/${ION_NODE_NUM}/g /etc/ion.rc
+ExecStartPre=sed -i -c s/@ION_NODE_NUM@/${ION_NODE_NUM}/g /etc/ion.rc
 ExecStart=ionstart -I /etc/ion.rc
 ExecStop=ionstop