Merge pull request #1948 from SUSE/for-deploy-7

🤖: Update build recipes for SP7
SUSE · Oct 31, 2024 · ad6cbc4 · ad6cbc4
2 parents ecff641 + 2736d08
commit ad6cbc4
Show file tree

Hide file tree

Showing 22 changed files with 66 additions and 11 deletions.
diff --git a/389-ds-container/389-ds-container.changes b/389-ds-container/389-ds-container.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 31 16:12:00 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- be explicit in protocol for expose statement
+
 -------------------------------------------------------------------
 Fri Oct 11 15:13:11 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/389-ds-container/Dockerfile b/389-ds-container/Dockerfile
@@ -46,7 +46,7 @@ LABEL com.suse.release-stage="beta"
 # endlabelprefix
 LABEL io.artifacthub.package.readme-url="%SOURCEURL%/README.md"
 CMD ["/usr/lib/dirsrv/dscontainer", "-r"]
-EXPOSE 3389 3636
+EXPOSE 3389/tcp 3636/tcp
 
 COPY nsswitch.conf /etc/nsswitch.conf
 

diff --git a/alertmanager-image/Dockerfile b/alertmanager-image/Dockerfile
@@ -47,7 +47,7 @@ LABEL com.suse.release-stage="beta"
 # endlabelprefix
 LABEL io.artifacthub.package.readme-url="%SOURCEURL%/README.md"
 ENTRYPOINT ["/usr/bin/prometheus-alertmanager"]
-EXPOSE 9093
+EXPOSE 9093/tcp
 HEALTHCHECK --interval=5s --timeout=5s --retries=5 \
     CMD ["/usr/bin/curl", "-m", "2", "-sf", "http://localhost:9093/-/healthy"]
 

diff --git a/alertmanager-image/alertmanager-image.changes b/alertmanager-image/alertmanager-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 31 16:12:00 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- be explicit in protocol for expose statement
+
 -------------------------------------------------------------------
 Wed Oct 30 15:35:27 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/blackbox_exporter-image/Dockerfile b/blackbox_exporter-image/Dockerfile
@@ -48,6 +48,6 @@ LABEL com.suse.release-stage="beta"
 LABEL io.artifacthub.package.readme-url="%SOURCEURL%/README.md"
 ENTRYPOINT ["/usr/bin/blackbox_exporter"]
 CMD ["--config.file=/etc/prometheus/blackbox.yml"]
-EXPOSE 9115
+EXPOSE 9115/tcp
 HEALTHCHECK --interval=5s --timeout=5s --retries=5 \
     CMD ["/usr/bin/curl", "-m", "2", "-sf", "http://localhost:9115/-/healthy"]
diff --git a/blackbox_exporter-image/blackbox_exporter-image.changes b/blackbox_exporter-image/blackbox_exporter-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 31 16:12:00 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- be explicit in protocol for expose statement
+
 -------------------------------------------------------------------
 Wed Oct 30 15:35:27 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/distribution-image/distribution-image.changes b/distribution-image/distribution-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 31 16:12:00 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- be explicit in protocol for expose statement
+
 -------------------------------------------------------------------
 Wed Oct 30 15:35:27 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/distribution-image/distribution-image.kiwi b/distribution-image/distribution-image.kiwi
@@ -59,7 +59,7 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
           <volume name="/var/lib/docker-registry" />
         </volumes>
         <expose>
-          <port number="5000" />
+          <port number="5000/tcp" />
         </expose>
       </containerconfig>
     </type>

diff --git a/grafana-image/Dockerfile b/grafana-image/Dockerfile
@@ -54,7 +54,7 @@ ENV GF_PATHS_PLUGINS="/var/lib/grafana/plugins"
 ENV GF_PATHS_PROVISIONING="/etc/grafana/provisioning"
 
 ENTRYPOINT ["/run.sh"]
-EXPOSE 3000
+EXPOSE 3000/tcp
 COPY run.sh /run.sh
 RUN set -euo pipefail; chmod +x /run.sh
 

diff --git a/grafana-image/grafana-image.changes b/grafana-image/grafana-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 31 16:12:00 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- be explicit in protocol for expose statement
+
 -------------------------------------------------------------------
 Wed Oct 30 15:35:27 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/nginx-image/Dockerfile b/nginx-image/Dockerfile
@@ -47,7 +47,7 @@ LABEL com.suse.release-stage="beta"
 LABEL io.artifacthub.package.readme-url="%SOURCEURL%/README.md"
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
 CMD ["nginx", "-g", "daemon off;"]
-EXPOSE 80
+EXPOSE 80/tcp
 # sanity check that the version from the tag is equal to the version of nginx that we expect
 RUN set -euo pipefail; [ "$(rpm -q --qf '%{version}' nginx | cut -d '.' -f -2)" = "1.21" ]
 RUN set -euo pipefail; mkdir /docker-entrypoint.d

diff --git a/nginx-image/nginx-image.changes b/nginx-image/nginx-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 31 16:12:00 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- be explicit in protocol for expose statement
+
 -------------------------------------------------------------------
 Wed Oct 30 15:35:27 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/pcp-image/Dockerfile b/pcp-image/Dockerfile
@@ -49,7 +49,7 @@ LABEL com.suse.release-stage="beta"
 LABEL io.artifacthub.package.readme-url="%SOURCEURL%/README.md"
 ENTRYPOINT ["/usr/local/bin/container-entrypoint"]
 CMD ["/usr/lib/systemd/systemd"]
-EXPOSE 44321 44322 44323
+EXPOSE 44321/tcp 44322/tcp 44323/tcp
 
 RUN set -euo pipefail; mkdir -p /usr/share/container-scripts/pcp; mkdir -p /etc/sysconfig
 COPY container-entrypoint healthcheck /usr/local/bin/

diff --git a/pcp-image/pcp-image.changes b/pcp-image/pcp-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 31 16:12:00 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- be explicit in protocol for expose statement
+
 -------------------------------------------------------------------
 Wed Oct 30 15:35:27 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/postgres-16-image/Dockerfile b/postgres-16-image/Dockerfile
@@ -55,7 +55,7 @@ ENV PGDATA="/var/lib/pgsql/data"
 
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
 CMD ["postgres"]
-EXPOSE 5432
+EXPOSE 5432/tcp
 COPY docker-entrypoint.sh /usr/local/bin/
 RUN set -euo pipefail; chmod +x /usr/local/bin/docker-entrypoint.sh; \
     sed -i -e 's/exec gosu postgres "/exec setpriv --reuid=postgres --regid=postgres --clear-groups -- "/g' /usr/local/bin/docker-entrypoint.sh; \

diff --git a/postgres-16-image/postgres-16-image.changes b/postgres-16-image/postgres-16-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 31 16:12:00 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- be explicit in protocol for expose statement
+
 -------------------------------------------------------------------
 Wed Oct 30 15:35:27 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/prometheus-image/Dockerfile b/prometheus-image/Dockerfile
@@ -48,7 +48,7 @@ LABEL com.suse.release-stage="beta"
 # endlabelprefix
 LABEL io.artifacthub.package.readme-url="%SOURCEURL%/README.md"
 ENTRYPOINT ["/usr/bin/prometheus"]
-EXPOSE 9090
+EXPOSE 9090/tcp
 HEALTHCHECK --interval=5s --timeout=5s --retries=5 \
     CMD ["/usr/bin/curl", "-m", "2", "-sf", "http://localhost:9090/-/healthy"]
 

diff --git a/prometheus-image/prometheus-image.changes b/prometheus-image/prometheus-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 31 16:12:00 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- be explicit in protocol for expose statement
+
 -------------------------------------------------------------------
 Wed Oct 30 15:35:27 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/rmt-mariadb-image/Dockerfile b/rmt-mariadb-image/Dockerfile
@@ -51,7 +51,7 @@ LABEL com.suse.release-stage="beta"
 LABEL io.artifacthub.package.readme-url="%SOURCEURL%/README.md"
 ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["mariadbd"]
-EXPOSE 3306
+EXPOSE 3306/tcp
 # sanity check that the version from the tag is equal to the version of mariadb-client that we expect
 RUN set -euo pipefail; [ "$(rpm -q --qf '%{version}' mariadb-client | cut -d '.' -f -2)" = "10.11" ]
 

diff --git a/rmt-mariadb-image/rmt-mariadb-image.changes b/rmt-mariadb-image/rmt-mariadb-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 31 16:12:00 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- be explicit in protocol for expose statement
+
 -------------------------------------------------------------------
 Wed Oct 30 15:35:27 UTC 2024 - SUSE Update Bot <[email protected]>
 

diff --git a/sac-postfix-image/Dockerfile b/sac-postfix-image/Dockerfile
@@ -51,7 +51,7 @@ LABEL com.suse.release-stage="beta"
 LABEL io.artifacthub.package.readme-url="%SOURCEURL%/README.md"
 ENTRYPOINT ["/entrypoint/entrypoint.sh"]
 CMD ["postfix", "start-fg"]
-EXPOSE 25 465 587
+EXPOSE 25/tcp 465/tcp 587/tcp
 RUN set -euo pipefail; mkdir -p /entrypoint/ldap
 COPY entrypoint.sles.sh /entrypoint/entrypoint.sh
 RUN set -euo pipefail; chmod +x /entrypoint/entrypoint.sh

diff --git a/sac-postfix-image/sac-postfix-image.changes b/sac-postfix-image/sac-postfix-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 31 16:12:00 UTC 2024 - SUSE Update Bot <[email protected]>
+
+- be explicit in protocol for expose statement
+
 -------------------------------------------------------------------
 Mon Oct 28 09:03:01 UTC 2024 - SUSE Update Bot <[email protected]>