|
16 | 16 | # Conditional variables - you can override the values of these variables from |
17 | 17 | # the command line |
18 | 18 | ############################################################################### |
| 19 | + |
| 20 | +include config.env |
| 21 | + |
19 | 22 | # RELEASE shows what release of the container code has been built |
20 | 23 | RELEASE ?= |
21 | 24 | # RELEASE_CANDIDATE shows what release candidate of the container code has been built |
22 | 25 | RELEASE_CANDIDATE ?= |
23 | | -# MQ_VERSION is the fully qualified MQ version number to build |
24 | | -MQ_VERSION ?= 9.2.0.0 |
25 | 26 | # MQ_ARCHIVE_REPOSITORY is a remote repository from which to pull the MQ_ARCHIVE (if required) |
26 | 27 | MQ_ARCHIVE_REPOSITORY ?= |
27 | 28 | # MQ_ARCHIVE_REPOSITORY_DEV is a remote repository from which to pull the MQ_ARCHIVE_DEV (if required) |
@@ -62,7 +63,7 @@ REGISTRY_USER ?= |
62 | 63 | REGISTRY_PASS ?= |
63 | 64 | # ARCH is the platform architecture (e.g. amd64, ppc64le or s390x) |
64 | 65 | ARCH ?= $(if $(findstring x86_64,$(shell uname -m)),amd64,$(shell uname -m)) |
65 | | -# Tag to use for fat-manifest |
| 66 | +# Tag to use for fat-manifest |
66 | 67 | MQ_MANIFEST_TAG=$(MQ_VERSION) |
67 | 68 |
|
68 | 69 | ############################################################################### |
@@ -402,7 +403,7 @@ push-manifest: build-skopeo-container |
402 | 403 | echo $(shell ./travis-build-scripts/create-manifest-list.sh -r $(MQ_DELIVERY_REGISTRY_HOSTNAME) -n $(MQ_DELIVERY_REGISTRY_NAMESPACE) -i $(MQ_IMAGE_DEVSERVER) -t $(MQ_MANIFEST_TAG) -u $(MQ_ARCHIVE_REPOSITORY_USER) -p $(MQ_ARCHIVE_REPOSITORY_CREDENTIAL) -d "$(MQ_IMAGE_DEVSERVER_AMD64_DIGEST) $(MQ_IMAGE_DEVSERVER_S390X_DIGEST)" $(END)) |
403 | 404 | $(info $(shell printf "** Calling script to create fat-manifest for $(MQ_IMAGE_ADVANCEDSERVER_MANIFEST)**"$(END))) |
404 | 405 | echo $(shell ./travis-build-scripts/create-manifest-list.sh -r $(MQ_DELIVERY_REGISTRY_HOSTNAME) -n $(MQ_DELIVERY_REGISTRY_NAMESPACE) -i $(MQ_IMAGE_ADVANCEDSERVER) -t $(MQ_MANIFEST_TAG) -u $(MQ_ARCHIVE_REPOSITORY_USER) -p $(MQ_ARCHIVE_REPOSITORY_CREDENTIAL) -d "$(MQ_IMAGE_ADVANCEDSERVER_AMD64_DIGEST) $(MQ_IMAGE_ADVANCEDSERVER_S390X_DIGEST)" $(END)) |
405 | | - |
| 406 | + |
406 | 407 | .PHONY: build-skopeo-container |
407 | 408 | build-skopeo-container: |
408 | 409 | $(COMMAND) images | grep -q "skopeo"; if [ $$? != 0 ]; then docker build -t skopeo:latest ./docker-builds/skopeo/; fi |
@@ -469,3 +470,14 @@ gosec: |
469 | 470 | fi ;\ |
470 | 471 |
|
471 | 472 | include formatting.mk |
| 473 | + |
| 474 | +.PHONY: update-release-information |
| 475 | +update-release-information: |
| 476 | + sed -i.bak 's/ARG MQ_URL=.*-LinuxX64.tar.gz"/ARG MQ_URL="https:\/\/public.dhe.ibm.com\/ibmdl\/export\/pub\/software\/websphere\/messaging\/mqadv\/$(MQ_VERSION)-IBM-MQ-Advanced-for-Developers-Non-Install-LinuxX64.tar.gz"/g' Dockerfile-server && rm Dockerfile-server.bak |
| 477 | + $(eval MQ_VERSION_1=$(shell echo '${MQ_VERSION}' | rev | cut -c 3- | rev)) |
| 478 | + sed -i.bak 's/IBM_MQ_.*_LINUX_X86-64_NOINST.tar.gz/IBM_MQ_${MQ_VERSION_1}_LINUX_X86-64_NOINST.tar.gz/g' docs/building.md && rm docs/building.md.bak |
| 479 | + sed -i.bak 's/ibm-mqadvanced-server:.*-amd64/ibm-mqadvanced-server:$(MQ_VERSION)-amd64/g' docs/security.md |
| 480 | + sed -i.bak 's/ibm-mqadvanced-server-dev.*-amd64/ibm-mqadvanced-server-dev:$(MQ_VERSION)-amd64/g' docs/security.md && rm docs/security.md.bak |
| 481 | + sed -i.bak 's/MQ_IMAGE_ADVANCEDSERVER=ibm-mqadvanced-server:.*-amd64/MQ_IMAGE_ADVANCEDSERVER=ibm-mqadvanced-server:$(MQ_VERSION)-amd64/g' docs/testing.md && rm docs/testing.md.bak |
| 482 | + $(eval MQ_VERSION_2=$(shell echo '${MQ_VERSION_1}' | rev | cut -c 3- | rev)) |
| 483 | + sed -i.bak 's/knowledgecenter\/SSFKSJ_.*\/com/knowledgecenter\/SSFKSJ_${MQ_VERSION_2}.0\/com/g' docs/usage.md && rm docs/usage.md.bak |
0 commit comments