Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: thoth-station/s2i-thoth
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c95b5925f2c1f1d6e418620d13940a3d24ce4a70
Choose a base ref
..
head repository: thoth-station/s2i-thoth
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 238072a0cdf90ef37040216ff3d548105294537d
Choose a head ref
Showing with 3 additions and 3 deletions.
  1. +1 −1 README.rst
  2. +2 −2 assemble
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@ Configuration options for Thoth's s2i image:

* ``THOTH_ADVISE`` - always use the recommended stack by Thoth (even if the lock file is present in the repo)
* ``THOTH_CONFIG_CHECK`` - verify values stated in the configuration file match the build environment
* ``THOTH_GENERATE_CONFIG`` - generate configuration file during the build process, overwrites already existing configuration file if present
* ``THOTH_FORCE_GENERATE_CONFIG`` - generate configuration file during the build process, overwrites already existing configuration file if present
* ``THOTH_PROVENANCE_CHECK`` - verify stack provenance - the provenance check is triggered only if the lock file is not comming from Thoth's recommendation engine (otherwise the stack has already verified provenance)
* ``THOTH_ASSEMBLE_DEBUG`` - run s2i's assemble script in verbose mode
* ``THOTH_DRY_RUN`` - submit stack to Thoth's recommendation engine but do **NOT** use the recommended lock file, use the lock file present in the repo instead
4 changes: 2 additions & 2 deletions assemble
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ THOTH_PROVENANCE_CHECK=${THOTH_PROVENANCE_CHECK:-1}
# Use Thamos from git instead of a PyPI release:
THOTH_FROM_MASTER=${THOTH_FROM_MASTER:-0}
# Generate .thoth.yaml file during the build process.
THOTH_GENERATE_CONFIG=${THOTH_GENERATE_CONFIG:-0}
THOTH_FORCE_GENERATE_CONFIG=${THOTH_FORCE_GENERATE_CONFIG:-0}
# Thoth host to submit recommendations to:
export THOTH_HOST=${THOTH_HOST:-khemenu.thoth-station.ninja}
# Disable progressbar for thamos:
@@ -39,7 +39,7 @@ function restore_lock() {
[[ -f ../requirements.txt ]] && cp ../requirements.txt .
}

[[ ${THOTH_GENERATE_CONFIG} -ne 0 ]] && {
[[ ${THOTH_FORCE_GENERATE_CONFIG} -ne 0 ]] && {
rm -f .thoth.yaml
thamos config --no-interactive
}