Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • heptapod/heptapod-docker
1 result
Show changes
Commits on Source (4)
......@@ -11,7 +11,7 @@
DEFAULT_IMAGE_TAG = 'testing'
HEPTAPOD_REGISTRY_IMAGE_REPOSITORY = (
"registry.heptapod.net/heptapod/omnibus-heptapod")
TARGET_IMAGE_REPOSITORY = "heptapod/heptapod"
TARGET_IMAGE_REPOSITORY = "docker.io/heptapod/heptapod"
HEPTAPOD_DOCKER_DIR = os.path.dirname(__file__)
OMNIBUS_HEPTAPOD_SOURCE = 'https://foss.heptapod.net/heptapod/omnibus-heptapod'
OMNIBUS_HEPTAPOD_CLONE_DEFAULT = os.path.realpath(os.path.join(
......
......@@ -10,7 +10,7 @@
logger = logging.getLogger(FILE_PATH.name.rsplit('.', 1)[0])
TWITT_TEMPLATE = (
"registry-pull-heptapod-push-docker#heptapod {version} "
"#heptapod {version} "
"released, COMMENT_HERE "
"Docker: https://hub.docker.com/r/heptapod/heptapod/"
"tags?name={version} Changelog: "
......@@ -51,7 +51,7 @@
help="Heptapod version to pull and release, e.g "
"17.1.2 or 17.2.0-2. The build number is optional"
)
parser.add_argument('--config',
parser.add_argument('-c', '--config',
help="Path to configuration file (TOML)",
default='config.toml')
parser.add_argument('-l', '--logging-level', default='info')
......@@ -76,4 +76,5 @@
dash_series,
latest)
config = cl_args.config
subprocess.check_call((BASE_DIR / 'registry-pull-heptapod-push-docker',
......@@ -79,6 +80,7 @@
subprocess.check_call((BASE_DIR / 'registry-pull-heptapod-push-docker',
'--push',
'--tag', image_testing_tag,
'--verify-hg-tag', omnibus_tag,
'--expected-image-id', image_id))
'--push',
'--tag', image_testing_tag,
'--verify-hg-tag', omnibus_tag,
'--config', config,
'--expected-image-id', image_id))
......@@ -84,6 +86,6 @@
push_release = [BASE_DIR / 'push-release', dash_series]
push_release = [BASE_DIR / 'push-release', '--config', config, dash_series]
if latest:
push_release.append('--latest')
subprocess.check_call(push_release)
......@@ -86,8 +88,8 @@
if latest:
push_release.append('--latest')
subprocess.check_call(push_release)
print("Now brag about it on social media, inserting additional comments "
print("\nNow brag about it on social media, inserting additional comments "
"into the following:\n")
print(TWITT_TEMPLATE.format(version=version))
......