diff --git a/Makefile b/Makefile index cd48fc6..e34dab8 100644 --- a/Makefile +++ b/Makefile @@ -117,14 +117,6 @@ MQ_ARCHIVE_DEV_9.1.2.0=mqadv_dev912_$(MQ_ARCHIVE_DEV_PLATFORM)_$(MQ_DEV_ARCH).ta MQ_ARCHIVE_DEV_9.1.3.0=mqadv_dev913_$(MQ_ARCHIVE_DEV_PLATFORM)_$(MQ_DEV_ARCH).tar.gz MQ_ARCHIVE_DEV_9.1.4.0=mqadv_dev914_$(MQ_ARCHIVE_DEV_PLATFORM)_$(MQ_DEV_ARCH).tar.gz -ifneq "$(RELEASE)" "$(EMPTY)" - MQ_IMAGE_FULL_RELEASE_NAME=ibm-mqadvanced-server:$(MQ_VERSION)-$(RELEASE)-$(ARCH) - MQ_IMAGE_DEV_FULL_RELEASE_NAME=ibm-mqadvanced-server-dev:$(MQ_VERSION)-$(RELEASE)-$(ARCH) -else - MQ_IMAGE_FULL_RELEASE_NAME=ibm-mqadvanced-server:$(MQ_VERSION)-$(ARCH) - MQ_IMAGE_DEV_FULL_RELEASE_NAME=ibm-mqadvanced-server-dev:$(MQ_VERSION)-$(ARCH) -endif - ifneq "$(MQ_DELIVERY_REGISTRY_NAMESPACE)" "$(EMPTY)" MQ_DELIVERY_REGISTRY_FULL_PATH=$(MQ_DELIVERY_REGISTRY_HOSTNAME)/$(MQ_DELIVERY_REGISTRY_NAMESPACE) else @@ -140,6 +132,12 @@ endif MQ_IMAGE_FULL_RELEASE_NAME=$(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG) MQ_IMAGE_DEV_FULL_RELEASE_NAME=$(MQ_IMAGE_DEVSERVER):$(MQ_TAG) +ifeq "$(MQ_DELIVERY_REGISTRY_HOSTNAME)" "ibmcom" + MQ_IMAGE_DEVSERVER_DOCKERHUB=mq +else ifeq "$(MQ_DELIVERY_REGISTRY_HOSTNAME)" "ibmcorp" + MQ_IMAGE_DEVSERVER_DOCKERHUB=mqadvanced-server-dev +endif + ############################################################################### # Build targets ############################################################################### @@ -354,6 +352,13 @@ push-devserver: $(COMMAND) tag $(MQ_IMAGE_DEVSERVER)\:$(MQ_TAG) $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_DEV_FULL_RELEASE_NAME) $(COMMAND) push $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_DEV_FULL_RELEASE_NAME) +.PHONY: push-devserver-dockerhub +push-devserver-dockerhub: + $(info $(SPACER)$(shell printf $(TITLE)"Push developer image to $(MQ_DELIVERY_REGISTRY_FULL_PATH)"$(END))) + $(COMMAND) login -u $(MQ_DELIVERY_REGISTRY_USER) -p $(MQ_DELIVERY_REGISTRY_CREDENTIAL) + $(COMMAND) tag $(MQ_IMAGE_DEVSERVER)\:$(MQ_TAG) $(MQ_DELIVERY_REGISTRY_HOSTNAME)/$(MQ_IMAGE_DEVSERVER_DOCKERHUB):$(MQ_TAG) + $(COMMAND) push $(MQ_DELIVERY_REGISTRY_HOSTNAME)/$(MQ_IMAGE_DEVSERVER_DOCKERHUB):$(MQ_TAG) + .PHONY: pull-advancedserver pull-advancedserver: $(info $(SPACER)$(shell printf $(TITLE)"Pull production image from $(MQ_DELIVERY_REGISTRY_FULL_PATH)"$(END))) diff --git a/manifests/dockerstore/manifest-9.1.4.yaml b/manifests/dockerstore/manifest-9.1.4.yaml new file mode 100644 index 0000000..20777cb --- /dev/null +++ b/manifests/dockerstore/manifest-9.1.4.yaml @@ -0,0 +1,28 @@ +# © Copyright IBM Corporation 2019 +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +image: ibmcorp/mqadvanced-server-dev:9.1.4.0-r1 +manifests: + - image: ibmcorp/mqadvanced-server-dev:9.1.4.0-r1-amd64 + platform: + architecture: amd64 + os: linux + - image: ibmcorp/mqadvanced-server-dev:9.1.4.0-r1-ppc64le + platform: + architecture: ppc64le + os: linux + - image: ibmcorp/mqadvanced-server-dev:9.1.4.0-r1-s390x + platform: + architecture: s390x + os: linux diff --git a/travis-build-scripts/release.sh b/travis-build-scripts/release.sh index 28cce57..49a567f 100755 --- a/travis-build-scripts/release.sh +++ b/travis-build-scripts/release.sh @@ -55,7 +55,7 @@ function set_staging_registry { function set_docker_hub { export MQ_DELIVERY_REGISTRY_HOSTNAME=ibmcom - export MQ_DELIVERY_REGISTRY_NAMESPACE=mq + export MQ_DELIVERY_REGISTRY_NAMESPACE="" export MQ_DELIVERY_REGISTRY_USER=$MQ_DOCKERHUB_REGISTRY_USER export MQ_DELIVERY_REGISTRY_CREDENTIAL=$MQ_DOCKERHUB_REGISTRY_CREDENTIAL } @@ -95,9 +95,12 @@ elif [ "$TYPE" = "production" ]; then # release developer images with fat manifests set_docker_hub - ./travis-build-scripts/push.sh developer amd64 - ./travis-build-scripts/push.sh developer ppc64le - ./travis-build-scripts/push.sh developer s390x + ARCH=amd64 make push-devserver-dockerhub + ARCH=ppc64le make push-devserver-dockerhub + ARCH=s390x make push-devserver-dockerhub + + curl -LO https://github.com/estesp/manifest-tool/releases/download/v0.9.0/manifest-tool-linux-amd64 + chmod a+x manifest-tool-linux-amd64 docker login --username $MQ_DOCKERHUB_REGISTRY_USER --password $MQ_DOCKERHUB_REGISTRY_CREDENTIAL ./manifest-tool-linux-amd64 push from-spec manifests/dockerhub/$MANIFEST_FILE @@ -105,9 +108,9 @@ elif [ "$TYPE" = "production" ]; then set_docker_store - ./travis-build-scripts/push.sh developer amd64 - ./travis-build-scripts/push.sh developer ppc64le - ./travis-build-scripts/push.sh developer s390x + ARCH=amd64 make push-devserver-dockerhub + ARCH=ppc64le make push-devserver-dockerhub + ARCH=s390x make push-devserver-dockerhub docker login --username $MQ_DOCKERHUB_REGISTRY_USER --password $MQ_DOCKERHUB_REGISTRY_CREDENTIAL ./manifest-tool-linux-amd64 push from-spec manifests/dockerstore/$MANIFEST_FILE