diff --git a/Dockerfile b/Dockerfile index d676880..1e1df44 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,7 +35,6 @@ LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI" LABEL org.opensuse.release-stage="released" # endlabelprefix -LABEL org.opencontainers.image.revision="%DISTURL%" LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/rmt-server-image/README.md" RUN set -euo pipefail; zypper -n in --no-recommends rmt-server catatonit; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2} diff --git a/entrypoint.sh b/entrypoint.sh index 4232280..92b0f79 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -25,7 +25,7 @@ SCC_SYNC="${SCC_SYNC:-true}" # Create adjusted /etc/rmt.conf echo -e "database:\n host: ${MYSQL_HOST}\n database: ${MYSQL_DATABASE}\n username: ${MYSQL_USER}\n password: ${MYSQL_PASSWORD}" > /etc/rmt.conf echo -e " adapter: mysql2\n encoding: utf8\n timeout: 5000\n pool: 5\n" >> /etc/rmt.conf -echo -e "scc:\n username: ${SCC_USERNAME}\n password: ${SCC_PASSWORD}\n sync_systems: ${SCC_SYNC}\n" >> /etc/rmt.conf +echo -e "scc:\n username: ${SCC_USERNAME}\n password: ${SCC_PASSWORD}\n sync_systems: true\n scc_sync: ${SCC_SYNC}\n" >> /etc/rmt.conf echo -e "log_level:\n rails: debug" >> /etc/rmt.conf if [ $# -eq 0 ]; then @@ -37,7 +37,7 @@ if [ "$1" == "/usr/share/rmt/bin/rails" -a "$2" == "server" ]; then pushd /usr/share/rmt > /dev/null /usr/share/rmt/bin/rails db:create db:migrate RAILS_ENV=production popd > /dev/null - if [ ${SCC_SYNC} != "false" ]; then + if [ ${SCC_SYNC} == "true" ]; then echo "Syncing product list" rmt-cli sync for PRODUCT in $SCC_PRODUCT_ENABLE diff --git a/rmt-server-image.changes b/rmt-server-image.changes index 0e8f477..665168a 100644 --- a/rmt-server-image.changes +++ b/rmt-server-image.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Aug 8 16:52:23 UTC 2024 - Natnael Getahun + +- update rmt.conf to store airgap state in a separate config var. + +------------------------------------------------------------------- +Thu Aug 8 16:43:43 UTC 2024 - Dirk Mueller + +- remove oci reference annotation again + ------------------------------------------------------------------- Mon Aug 5 11:38:13 UTC 2024 - Dirk Mueller