Skip to content

Commit

Permalink
Merge pull request #1947 from SUSE/for-deploy-Tumbleweed
Browse files Browse the repository at this point in the history
🤖: Update build recipes for Tumbleweed
  • Loading branch information
dirkmueller authored Oct 31, 2024
2 parents 0c15207 + 2d0ee3d commit db7a4f7
Show file tree
Hide file tree
Showing 38 changed files with 110 additions and 20 deletions.
5 changes: 5 additions & 0 deletions 389-ds-container/389-ds-container.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 30 18:28:27 UTC 2024 - SUSE Update Bot <[email protected]>

- be explicit in protocol for expose statement

-------------------------------------------------------------------
Fri Oct 11 15:12:52 UTC 2024 - SUSE Update Bot <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion 389-ds-container/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ LABEL org.opensuse.release-stage="released"
# endlabelprefix
LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/389-ds-container/README.md"
CMD ["/usr/lib/dirsrv/dscontainer", "-r"]
EXPOSE 3389 3636
EXPOSE 3389/tcp 3636/tcp

COPY nsswitch.conf /etc/nsswitch.conf

Expand Down
2 changes: 1 addition & 1 deletion alertmanager-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ LABEL org.opensuse.release-stage="released"
# endlabelprefix
LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/alertmanager-image/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"]

Expand Down
5 changes: 5 additions & 0 deletions alertmanager-image/alertmanager-image.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 30 18:28:27 UTC 2024 - SUSE Update Bot <[email protected]>

- be explicit in protocol for expose statement

-------------------------------------------------------------------
Wed Oct 30 15:34:45 UTC 2024 - SUSE Update Bot <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion apache-tomcat-10-image/Dockerfile.openjdk17
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ ENV CATALINA_BASE="/usr/share/tomcat"
ENV PATH="/usr/share/tomcat/bin:$PATH"

CMD ["/usr/libexec/tomcat/server", "start"]
EXPOSE 8080
EXPOSE 8080/tcp
RUN set -euo pipefail; mkdir -p /var/log/tomcat; chown --recursive tomcat:tomcat /var/log/tomcat
RUN set -euo pipefail; ln -s /usr/share/tomcat /usr/local/tomcat
RUN set -euo pipefail; \
Expand Down
2 changes: 1 addition & 1 deletion apache-tomcat-10-image/Dockerfile.openjdk21
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ ENV CATALINA_BASE="/usr/share/tomcat"
ENV PATH="/usr/share/tomcat/bin:$PATH"

CMD ["/usr/libexec/tomcat/server", "start"]
EXPOSE 8080
EXPOSE 8080/tcp
RUN set -euo pipefail; mkdir -p /var/log/tomcat; chown --recursive tomcat:tomcat /var/log/tomcat
RUN set -euo pipefail; ln -s /usr/share/tomcat /usr/local/tomcat
RUN set -euo pipefail; \
Expand Down
2 changes: 1 addition & 1 deletion apache-tomcat-10-image/Dockerfile.openjdk23
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ ENV CATALINA_BASE="/usr/share/tomcat"
ENV PATH="/usr/share/tomcat/bin:$PATH"

CMD ["/usr/libexec/tomcat/server", "start"]
EXPOSE 8080
EXPOSE 8080/tcp
RUN set -euo pipefail; mkdir -p /var/log/tomcat; chown --recursive tomcat:tomcat /var/log/tomcat
RUN set -euo pipefail; ln -s /usr/share/tomcat /usr/local/tomcat
RUN set -euo pipefail; \
Expand Down
5 changes: 5 additions & 0 deletions apache-tomcat-10-image/apache-tomcat-10-image.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 30 18:28:27 UTC 2024 - SUSE Update Bot <[email protected]>

- be explicit in protocol for expose statement

-------------------------------------------------------------------
Wed Oct 30 15:34:45 UTC 2024 - SUSE Update Bot <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion apache-tomcat-9-image/Dockerfile.openjdk17
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ ENV CATALINA_BASE="/usr/share/tomcat"
ENV PATH="/usr/share/tomcat/bin:$PATH"

CMD ["/usr/libexec/tomcat/server", "start"]
EXPOSE 8080
EXPOSE 8080/tcp
RUN set -euo pipefail; mkdir -p /var/log/tomcat; chown --recursive tomcat:tomcat /var/log/tomcat
RUN set -euo pipefail; ln -s /usr/share/tomcat /usr/local/tomcat
RUN set -euo pipefail; \
Expand Down
5 changes: 5 additions & 0 deletions apache-tomcat-9-image/apache-tomcat-9-image.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 30 18:28:27 UTC 2024 - SUSE Update Bot <[email protected]>

- be explicit in protocol for expose statement

-------------------------------------------------------------------
Wed Oct 30 15:34:45 UTC 2024 - SUSE Update Bot <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion blackbox_exporter-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@ LABEL org.opensuse.release-stage="released"
LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/blackbox_exporter-image/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"]
5 changes: 5 additions & 0 deletions blackbox_exporter-image/blackbox_exporter-image.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 30 18:28:27 UTC 2024 - SUSE Update Bot <[email protected]>

- be explicit in protocol for expose statement

-------------------------------------------------------------------
Wed Oct 30 15:34:45 UTC 2024 - SUSE Update Bot <[email protected]>

Expand Down
5 changes: 5 additions & 0 deletions distribution-image/distribution-image.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 30 18:28:27 UTC 2024 - SUSE Update Bot <[email protected]>

- be explicit in protocol for expose statement

-------------------------------------------------------------------
Wed Oct 30 15:34:45 UTC 2024 - SUSE Update Bot <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion distribution-image/distribution-image.kiwi
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,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>
Expand Down
2 changes: 1 addition & 1 deletion grafana-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,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

Expand Down
5 changes: 5 additions & 0 deletions grafana-image/grafana-image.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 30 18:28:27 UTC 2024 - SUSE Update Bot <[email protected]>

- be explicit in protocol for expose statement

-------------------------------------------------------------------
Wed Oct 30 15:34:45 UTC 2024 - SUSE Update Bot <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion mariadb-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ LABEL org.opensuse.release-stage="released"
LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/mariadb-image/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)" = "11.5" ]

Expand Down
5 changes: 5 additions & 0 deletions mariadb-image/mariadb-image.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 30 18:28:27 UTC 2024 - SUSE Update Bot <[email protected]>

- be explicit in protocol for expose statement

-------------------------------------------------------------------
Wed Oct 30 15:34:45 UTC 2024 - SUSE Update Bot <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion nginx-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ LABEL org.opensuse.release-stage="released"
LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/nginx-image/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.27" ]
RUN set -euo pipefail; mkdir /docker-entrypoint.d
Expand Down
5 changes: 5 additions & 0 deletions nginx-image/nginx-image.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 30 18:28:27 UTC 2024 - SUSE Update Bot <[email protected]>

- be explicit in protocol for expose statement

-------------------------------------------------------------------
Wed Oct 30 15:34:45 UTC 2024 - SUSE Update Bot <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion pcp-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ LABEL org.opensuse.release-stage="released"
LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/pcp-image/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/
Expand Down
5 changes: 5 additions & 0 deletions pcp-image/pcp-image.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 30 18:28:27 UTC 2024 - SUSE Update Bot <[email protected]>

- be explicit in protocol for expose statement

-------------------------------------------------------------------
Wed Oct 30 15:34:45 UTC 2024 - SUSE Update Bot <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion postfix-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ LABEL org.opensuse.release-stage="released"
LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/postfix-image/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.sh /entrypoint/entrypoint.sh
RUN set -euo pipefail; chmod +x /entrypoint/entrypoint.sh
Expand Down
5 changes: 5 additions & 0 deletions postfix-image/postfix-image.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 30 18:28:27 UTC 2024 - SUSE Update Bot <[email protected]>

- be explicit in protocol for expose statement

-------------------------------------------------------------------
Wed Oct 30 15:34:45 UTC 2024 - SUSE Update Bot <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion postgres-12-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,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; \
Expand Down
5 changes: 5 additions & 0 deletions postgres-12-image/postgres-12-image.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 30 18:28:27 UTC 2024 - SUSE Update Bot <[email protected]>

- be explicit in protocol for expose statement

-------------------------------------------------------------------
Wed Oct 30 15:34:45 UTC 2024 - SUSE Update Bot <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion postgres-13-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,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; \
Expand Down
5 changes: 5 additions & 0 deletions postgres-13-image/postgres-13-image.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 30 18:28:27 UTC 2024 - SUSE Update Bot <[email protected]>

- be explicit in protocol for expose statement

-------------------------------------------------------------------
Wed Oct 30 15:34:45 UTC 2024 - SUSE Update Bot <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion postgres-14-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,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; \
Expand Down
5 changes: 5 additions & 0 deletions postgres-14-image/postgres-14-image.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 30 18:28:27 UTC 2024 - SUSE Update Bot <[email protected]>

- be explicit in protocol for expose statement

-------------------------------------------------------------------
Wed Oct 30 15:34:45 UTC 2024 - SUSE Update Bot <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion postgres-15-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,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; \
Expand Down
5 changes: 5 additions & 0 deletions postgres-15-image/postgres-15-image.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 30 18:28:27 UTC 2024 - SUSE Update Bot <[email protected]>

- be explicit in protocol for expose statement

-------------------------------------------------------------------
Wed Oct 30 15:34:45 UTC 2024 - SUSE Update Bot <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion postgres-16-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,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; \
Expand Down
5 changes: 5 additions & 0 deletions postgres-16-image/postgres-16-image.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 30 18:28:27 UTC 2024 - SUSE Update Bot <[email protected]>

- be explicit in protocol for expose statement

-------------------------------------------------------------------
Wed Oct 30 15:34:45 UTC 2024 - SUSE Update Bot <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion postgres-17-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,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; \
Expand Down
5 changes: 5 additions & 0 deletions postgres-17-image/postgres-17-image.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 30 18:28:27 UTC 2024 - SUSE Update Bot <[email protected]>

- be explicit in protocol for expose statement

-------------------------------------------------------------------
Wed Oct 30 15:34:45 UTC 2024 - SUSE Update Bot <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion prometheus-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ LABEL org.opensuse.release-stage="released"
# endlabelprefix
LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/prometheus-image/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"]

Expand Down
5 changes: 5 additions & 0 deletions prometheus-image/prometheus-image.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 30 18:28:27 UTC 2024 - SUSE Update Bot <[email protected]>

- be explicit in protocol for expose statement

-------------------------------------------------------------------
Wed Oct 30 15:34:45 UTC 2024 - SUSE Update Bot <[email protected]>

Expand Down

0 comments on commit db7a4f7

Please sign in to comment.