Merge branch 'uyuni-project:master' into ci_add_scc_mirror

uyuni-project · Dec 9, 2024 · 972a023 · 972a023
2 parents 5dd95d6 + 2038ceb
commit 972a023
Show file tree

Hide file tree

Showing 94 changed files with 833 additions and 1,471 deletions.
diff --git a/containers/server-image/Dockerfile b/containers/server-image/Dockerfile
@@ -49,6 +49,7 @@ RUN zypper --gpg-auto-import-keys --non-interactive install --auto-agree-with-li
     sapnwbootstrap-formula \
     drbd-formula \
     habootstrap-formula \
+    saline-formula \
     salt-shaptools \
     inter-server-sync \
     golang-github-prometheus-node_exporter \

diff --git a/...ainers/server-image/server-image.changes.vzhestkov.add-saline-formula-to-server-container b/...ainers/server-image/server-image.changes.vzhestkov.add-saline-formula-to-server-container
@@ -0,0 +1 @@
+- Add saline-formula to the server container image
diff --git a/containers/server-saline-image/Dockerfile b/containers/server-saline-image/Dockerfile
@@ -0,0 +1,52 @@
+# SPDX-License-Identifier: MIT
+#!BuildTag: uyuni/server-saline:latest
+
+ARG BASE=registry.suse.com/bci/bci-base:15.6
+FROM $BASE
+
+ARG PRODUCT=Uyuni
+ARG VENDOR="Uyuni project"
+ARG URL="https://www.uyuni-project.org/"
+ARG REFERENCE_PREFIX="registry.opensuse.org/uyuni"
+
+RUN groupadd -r --gid 10554 salt && \
+    useradd -r -s /usr/sbin/nologin -g salt -d /var/lib/salt --uid 10554 salt
+
+# Main packages
+RUN zypper ref -f && zypper --non-interactive up
+RUN zypper --gpg-auto-import-keys --non-interactive install --auto-agree-with-licenses --force-resolution --download-only saline python3-saline
+RUN find /var/cache/zypp/packages/ -type f -name '*.rpm'
+RUN rpm -ivh --nodeps $(find /var/cache/zypp/packages/ -type f \
+    -name update-alternatives.rpm -o \
+    -name python3-base.rpm -o -name 'libpython3*.rpm' -o -name 'libopenssl1*.rpm' -o -name libexpat1.rpm -o \
+    -name python3-CherryPy.rpm -o -name python3-zc.lockfile.rpm -o -name python3-cheroot.rpm -o -name python3-six.rpm -o \
+    -name python3-portend.rpm -o -name python3-tempora.rpm -o \
+    -name salt.rpm -o -name python3-salt.rpm -o \
+    -name python3-contextvars.rpm -o -name python3-immutables.rpm -o -name python3-looseversion.rpm -o \
+    -name python3-packaging.rpm -o -name python3-distro.rpm -o \
+    -name python3-PyYAML.rpm -o -name 'libyaml*.rpm' -o -name python3-Jinja2.rpm -o -name python3-MarkupSafe.rpm -o \
+    -name python3-msgpack.rpm -o -name python3-more-itertools.rpm -o \
+    -name saline.rpm -o -name python3-saline.rpm -o -name python3-python-dateutil.rpm)
+RUN zypper clean --all
+
+RUN mkdir /etc/saline.defaults && cp -r /etc/salt/saline* /etc/saline.defaults/
+RUN chown -R salt:salt /etc/saline.defaults
+
+# Build Service required labels
+# labelprefix=org.opensuse.uyuni.server-saline
+LABEL org.opencontainers.image.title="${PRODUCT} server saline container"
+LABEL org.opencontainers.image.description="Image contains the ${PRODUCT} server component to extend Salt capabilities"
+LABEL org.opencontainers.image.created="%BUILDTIME%"
+LABEL org.opencontainers.image.vendor="${VENDOR}"
+LABEL org.opencontainers.image.url="${URL}"
+LABEL org.opencontainers.image.name=server-saline-image
+LABEL org.opencontainers.image.version=5.1.0
+LABEL org.openbuildservice.disturl="%DISTURL%"
+LABEL org.opensuse.reference="${REFERENCE_PREFIX}/salt-saline:${PRODUCT_VERSION}.%RELEASE%"
+# endlabelprefix
+
+COPY cleanup.sh /cleanup.sh
+RUN /bin/bash /cleanup.sh ; rm /cleanup.sh
+
+COPY run_saline.sh /run_saline.sh
+CMD ["/bin/bash", "/run_saline.sh"]
diff --git a/containers/server-saline-image/_service b/containers/server-saline-image/_service
@@ -0,0 +1,4 @@
+<services>
+  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service mode="buildtime" name="docker_label_helper"/>
+</services>
diff --git a/containers/server-saline-image/cleanup.sh b/containers/server-saline-image/cleanup.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+find /etc -maxdepth 1 -type f -name '*-' -delete
+rm -rf /etc/salt /run/zypp.pid /srv/spm /usr/lib/rpm/macros.d/macros.python3 /usr/lib/sysimage/rpm/* \
+       /usr/share/doc /usr/share/licenses /usr/share/man
+find /var/log -maxdepth 1 -type f -name '*.log' | xargs -I /bin/bash -c "echo '' > {}"
diff --git a/containers/server-saline-image/run_saline.sh b/containers/server-saline-image/run_saline.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+if test -n "$TZ" -a -f "/usr/share/zoneinfo/$TZ"; then
+    ln -sf "/usr/share/zoneinfo/$TZ" /etc/localtime
+fi
+
+cp -r /etc/saline.defaults/saline* /etc/salt/
+
+mkdir --parents /run/saline/pki
+chown --recursive salt:salt /run/saline
+chmod 0750 /run/saline/pki
+
+if [[ "$NOSSL" == "YES" ]]; then
+    cat > /etc/salt/saline.d/restapi.conf <<EOL
+restapi:
+  host: 0.0.0.0
+  disable_ssl: true
+EOL
+else
+    cp /etc/pki/tls/certs/spacewalk.crt /run/saline/pki/saline.crt
+    cp /etc/pki/tls/private/spacewalk.key /run/saline/pki/saline.key
+    chown --recursive salt:salt /run/saline/pki
+    cat > /etc/salt/saline.d/restapi.conf <<EOL
+restapi:
+  host: 0.0.0.0
+  ssl_crt: /run/saline/pki/saline.crt
+  ssl_key: /run/saline/pki/saline.key
+EOL
+fi
+
+chown --recursive salt:salt /etc/salt/saline*
+
+exec /usr/bin/salined -l info
diff --git a/containers/server-saline-image/server-saline-image.changes b/containers/server-saline-image/server-saline-image.changes
@@ -0,0 +1 @@
+- Initial version
diff --git a/containers/server-saline-image/tito.props b/containers/server-saline-image/tito.props
@@ -0,0 +1,3 @@
+[buildconfig]
+tagger = tito.tagger.SUSEContainerTagger
+builder = custom.ContainerBuilder
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml
@@ -9627,7 +9627,7 @@ Alternatively, you will want to download &lt;strong&gt;Incremental Channel Conte
         <target>সিস্টেমে Virtualization এনটাইটেলমেন্ট স্থাপন করার ফলে সিস্টেম দ্বারা ভার্চুয়াল গেস্ট পরিচালনা কর্মে সহায়তার জন্য অতিরিক্ত কিছু কর্ম সঞ্চালিত হয়েছে। অধিক বিবরণের জন্য &lt;a href="{0}"&gt;এইখানে দেখুন&lt;/a&gt; দেখুন।</target>
       </trans-unit>
       <trans-unit id="system.entitle.added.monitoring_entitled" xml:space="preserve">
-        <source>&lt;strong&gt;Monitoring&lt;/strong&gt; type has been applied.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Since you added the Monitoring system type we automatically assigned the Prometheus Exporters formula to the system. Please apply the &lt;a href="/rhn/manager/systems/details/highstate?sid={0}"&gt;Highstate&lt;/a&gt; in order to install and enable the Prometheus metrics exporters.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Please make sure to open the &lt;a href="/docs/{1}/installation-and-upgrade/ports.html#_external_client_ports" target="_blank"&gt;required network ports&lt;/a&gt; for all installed exporters.</source>
+        <source>&lt;strong&gt;Monitor this Host&lt;/strong&gt; type has been applied.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Since you added the Monitoring system type we automatically assigned the Prometheus Exporters formula to the system. Please apply the &lt;a href="/rhn/manager/systems/details/highstate?sid={0}"&gt;Highstate&lt;/a&gt; in order to install and enable the Prometheus metrics exporters.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Please make sure to open the &lt;a href="/docs/{1}/installation-and-upgrade/ports.html#_external_client_ports" target="_blank"&gt;required network ports&lt;/a&gt; for all installed exporters.</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/systems/details/Overview.do</context>
         </context-group>

diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ca.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ca.xml
@@ -10296,11 +10296,11 @@ lt;stronggt;Note:lt;/stronggt; La documentació addicional sobre l'ús de l'ISO
         <target state="translated">Atès que vas afegir un tipus de sistema de virtualització al sistema, també vam realitzar alguns passos addicionals per assegurar que el teu sistema serà capaç de gestionar millor els convidats virtuals. Vegeu lt;a href."/docs/administration/virtualization.html"gt;herelt;/agt; per a més informació.</target>
       </trans-unit>
       <trans-unit id="system.entitle.added.monitoring_entitled" xml:space="preserve">
-        <source>&lt;strong&gt;Monitoring&lt;/strong&gt; type has been applied.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Since you added the Monitoring system type we automatically assigned the Prometheus Exporters formula to the system. Please apply the &lt;a href="/rhn/manager/systems/details/highstate?sid={0}"&gt;Highstate&lt;/a&gt; in order to install and enable the Prometheus metrics exporters.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Please make sure to open the &lt;a href="/docs/{1}/installation-and-upgrade/ports.html#_external_client_ports" target="_blank"&gt;required network ports&lt;/a&gt; for all installed exporters.</source>
+        <source>&lt;strong&gt;Monitor this Host&lt;/strong&gt; type has been applied.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Since you added the Monitoring system type we automatically assigned the Prometheus Exporters formula to the system. Please apply the &lt;a href="/rhn/manager/systems/details/highstate?sid={0}"&gt;Highstate&lt;/a&gt; in order to install and enable the Prometheus metrics exporters.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Please make sure to open the &lt;a href="/docs/{1}/installation-and-upgrade/ports.html#_external_client_ports" target="_blank"&gt;required network ports&lt;/a&gt; for all installed exporters.</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/systems/details/Overview.do</context>
         </context-group>
-        <target state="translated">S'ha aplicat el tipus lt;stronggt;Monitoringlt;/stronggt;.lt;br/gt;lt;stronggt;Nota:lt;/stronggt; Des que heu afegit el tipus de sistema de monitoratge, assignem automàticament la fórmula dels exportadors de Prometheus al sistema. Apliqueu lt;a href."/rhn/manager/systems/details/highstate?sid{0}{0}"gt;Highstatelt;/agt; per instal·lar i habilitar els exportadors de mètriques Prometheus.lt;br/gt;lt;stronggt;Note:lt;/stronggt; Assegureu-vos d'obrir lt;a href."/docs/{1}/installation-and-upgrade/ports.html.externalclientports" target."blank"gt; ports de xarxa necessarislt;/agt; per a tots els exportadors instal·lats.</target>
+        <target state="needs-adaptation">S'ha aplicat el tipus lt;stronggt;Monitoringlt;/stronggt;.lt;br/gt;lt;stronggt;Nota:lt;/stronggt; Des que heu afegit el tipus de sistema de monitoratge, assignem automàticament la fórmula dels exportadors de Prometheus al sistema. Apliqueu lt;a href."/rhn/manager/systems/details/highstate?sid{0}{0}"gt;Highstatelt;/agt; per instal·lar i habilitar els exportadors de mètriques Prometheus.lt;br/gt;lt;stronggt;Note:lt;/stronggt; Assegureu-vos d'obrir lt;a href."/docs/{1}/installation-and-upgrade/ports.html.externalclientports" target."blank"gt; ports de xarxa necessarislt;/agt; per a tots els exportadors instal·lats.</target>
       </trans-unit>
       <trans-unit id="system.entitle.formula_error" xml:space="preserve">
         <source>There was a problem assigning the Prometheus Exporters formula.</source>

diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_cs.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_cs.xml
@@ -10321,7 +10321,7 @@ Alternatively, you will want to download &lt;strong&gt;Incremental Channel Conte
         </context-group>
       </trans-unit>
       <trans-unit id="system.entitle.added.monitoring_entitled" xml:space="preserve">
-        <source>&lt;strong&gt;Monitoring&lt;/strong&gt; type has been applied.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Since you added the Monitoring system type we automatically assigned the Prometheus Exporters formula to the system. Please apply the &lt;a href="/rhn/manager/systems/details/highstate?sid={0}"&gt;Highstate&lt;/a&gt; in order to install and enable the Prometheus metrics exporters.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Please make sure to open the &lt;a href="/docs/{1}/installation-and-upgrade/ports.html#_external_client_ports" target="_blank"&gt;required network ports&lt;/a&gt; for all installed exporters.</source>
+        <source>&lt;strong&gt;Monitor this Host&lt;/strong&gt; type has been applied.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Since you added the Monitoring system type we automatically assigned the Prometheus Exporters formula to the system. Please apply the &lt;a href="/rhn/manager/systems/details/highstate?sid={0}"&gt;Highstate&lt;/a&gt; in order to install and enable the Prometheus metrics exporters.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Please make sure to open the &lt;a href="/docs/{1}/installation-and-upgrade/ports.html#_external_client_ports" target="_blank"&gt;required network ports&lt;/a&gt; for all installed exporters.</source>
         <target state="needs-adaptation"/>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/systems/details/Overview.do</context>

diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml
@@ -10070,7 +10070,7 @@ Alternatively, you will want to download &lt;strong&gt;Incremental Channel Conte
         <target>Da Sie dem System eine Virtualisierungsberechtigung hinzugefügt haben, haben wir zusätzlich einige extra Schritte durchgeführt, um sicherzustellen, dass Ihr System in der Lage ist, virtuelle Gäste besser zu verwalten.  Mehr Informationen hierzu finden Sie &lt;a href="{0}"&gt;hier&lt;/a&gt;.</target>
       </trans-unit>
       <trans-unit id="system.entitle.added.monitoring_entitled" xml:space="preserve">
-        <source>&lt;strong&gt;Monitoring&lt;/strong&gt; type has been applied.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Since you added the Monitoring system type we automatically assigned the Prometheus Exporters formula to the system. Please apply the &lt;a href="/rhn/manager/systems/details/highstate?sid={0}"&gt;Highstate&lt;/a&gt; in order to install and enable the Prometheus metrics exporters.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Please make sure to open the &lt;a href="/docs/{1}/installation-and-upgrade/ports.html#_external_client_ports" target="_blank"&gt;required network ports&lt;/a&gt; for all installed exporters.</source>
+        <source>&lt;strong&gt;Monitor this Host&lt;/strong&gt; type has been applied.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Since you added the Monitoring system type we automatically assigned the Prometheus Exporters formula to the system. Please apply the &lt;a href="/rhn/manager/systems/details/highstate?sid={0}"&gt;Highstate&lt;/a&gt; in order to install and enable the Prometheus metrics exporters.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Please make sure to open the &lt;a href="/docs/{1}/installation-and-upgrade/ports.html#_external_client_ports" target="_blank"&gt;required network ports&lt;/a&gt; for all installed exporters.</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/systems/details/Overview.do</context>
         </context-group>

diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -9110,7 +9110,7 @@ Alternatively, you will want to download &lt;strong&gt;Incremental Channel Conte
         </context-group>
       </trans-unit>
       <trans-unit id="system.entitle.added.monitoring_entitled" xml:space="preserve">
-        <source>&lt;strong&gt;Monitoring&lt;/strong&gt; type has been applied.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Since you added the Monitoring system type we automatically assigned the Prometheus Exporters formula to the system. Please apply the &lt;a href="/rhn/manager/systems/details/highstate?sid={0}"&gt;Highstate&lt;/a&gt; in order to install and enable the Prometheus metrics exporters.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Please make sure to open the &lt;a href="/docs/{1}/installation-and-upgrade/ports.html#_external_client_ports" target="_blank">required network ports&lt;/a&gt; for all installed exporters.</source>
+        <source>&lt;strong&gt;Monitor this Host&lt;/strong&gt; type has been applied.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Since you added the Monitoring system type we automatically assigned the Prometheus Exporters formula to the system. Please apply the &lt;a href="/rhn/manager/systems/details/highstate?sid={0}"&gt;Highstate&lt;/a&gt; in order to install and enable the Prometheus metrics exporters.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Please make sure to open the &lt;a href="/docs/{1}/installation-and-upgrade/ports.html#_external_client_ports" target="_blank">required network ports&lt;/a&gt; for all installed exporters.</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/systems/details/Overview.do</context>
         </context-group>

diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
@@ -9995,7 +9995,7 @@ Alternatively, you will want to download &lt;strong&gt;Incremental Channel Conte
         <target state="needs-adaptation">Ya que usted ha añadido derechos de virtualización al sistema, también hemos llevado a cabo algunos pasos adicionales para estar seguros de que su sistema pueda administrar mejor los huéspedes virtuales. Para obtener más información,  consulte &lt;a href="{0}"&gt;aquí&lt;/a&gt;</target>
       </trans-unit>
       <trans-unit id="system.entitle.added.monitoring_entitled" xml:space="preserve">
-        <source>&lt;strong&gt;Monitoring&lt;/strong&gt; type has been applied.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Since you added the Monitoring system type we automatically assigned the Prometheus Exporters formula to the system. Please apply the &lt;a href="/rhn/manager/systems/details/highstate?sid={0}"&gt;Highstate&lt;/a&gt; in order to install and enable the Prometheus metrics exporters.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Please make sure to open the &lt;a href="/docs/{1}/installation-and-upgrade/ports.html#_external_client_ports" target="_blank"&gt;required network ports&lt;/a&gt; for all installed exporters.</source>
+        <source>&lt;strong&gt;Monitor this Host&lt;/strong&gt; type has been applied.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Since you added the Monitoring system type we automatically assigned the Prometheus Exporters formula to the system. Please apply the &lt;a href="/rhn/manager/systems/details/highstate?sid={0}"&gt;Highstate&lt;/a&gt; in order to install and enable the Prometheus metrics exporters.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Please make sure to open the &lt;a href="/docs/{1}/installation-and-upgrade/ports.html#_external_client_ports" target="_blank"&gt;required network ports&lt;/a&gt; for all installed exporters.</source>
         <target state="needs-adaptation">Como ha añadido el tipo de sistema Supervisión, hemos asignado automáticamente la fórmula Exportadores de Prometheus al sistema. Aplique &lt;a href="/rhn/manager/systems/details/highstate?sid={0}"&gt;Highstate&lt;/a&gt; para instalar y activar los exportadores de métricas de Prometheus.</target>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/systems/details/Overview.do</context>

diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml
@@ -10031,7 +10031,7 @@ Alternatively, you will want to download &lt;strong&gt;Incremental Channel Conte
         <target>Étant donné que vous avez ajouté un droit d'accès Virtualisation au système, nous avons également effectué quelques étapes supplémentaires pour nous assurer que votre système sera capable de mieux gérer les invités virtuels. Cliquez &lt;a href="{0}"&gt;ici&lt;/a&gt; pour davantage d'informations.</target>
       </trans-unit>
       <trans-unit id="system.entitle.added.monitoring_entitled" xml:space="preserve">
-        <source>&lt;strong&gt;Monitoring&lt;/strong&gt; type has been applied.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Since you added the Monitoring system type we automatically assigned the Prometheus Exporters formula to the system. Please apply the &lt;a href="/rhn/manager/systems/details/highstate?sid={0}"&gt;Highstate&lt;/a&gt; in order to install and enable the Prometheus metrics exporters.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Please make sure to open the &lt;a href="/docs/{1}/installation-and-upgrade/ports.html#_external_client_ports" target="_blank"&gt;required network ports&lt;/a&gt; for all installed exporters.</source>
+        <source>&lt;strong&gt;Monitor this Host&lt;/strong&gt; type has been applied.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Since you added the Monitoring system type we automatically assigned the Prometheus Exporters formula to the system. Please apply the &lt;a href="/rhn/manager/systems/details/highstate?sid={0}"&gt;Highstate&lt;/a&gt; in order to install and enable the Prometheus metrics exporters.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Please make sure to open the &lt;a href="/docs/{1}/installation-and-upgrade/ports.html#_external_client_ports" target="_blank"&gt;required network ports&lt;/a&gt; for all installed exporters.</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/systems/details/Overview.do</context>
         </context-group>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- Add saline-formula to the server container image