From 53d928c24f7b91f3286fec387d0be7ae0fbfb8ec Mon Sep 17 00:00:00 2001 From: Dmytro Dovbii Date: Mon, 27 Apr 2015 14:32:30 +0300 Subject: [PATCH] Delete PHP Zend Server app from murano-apps repository Since Docker implementation of Zend Server is a preview, developers include a time limited license with it. Murano-apps repository includes apps which can work immediately out of box and supporting of license essentially restricts this ability. So, this app must be deleted. Change-Id: I70ee12d7d4fa3ec307324b9019bc57ab54903a44 Closes-Bug: #1445087 --- .../package/Classes/DockerPHPZendServer.yaml | 97 ---------- Applications/PHPZendServer/package/LICENSE | 175 ------------------ Applications/PHPZendServer/package/UI/ui.yaml | 92 --------- Applications/PHPZendServer/package/logo.png | Bin 3347 -> 0 bytes .../PHPZendServer/package/manifest.yaml | 22 --- 5 files changed, 386 deletions(-) delete mode 100644 Applications/PHPZendServer/package/Classes/DockerPHPZendServer.yaml delete mode 100644 Applications/PHPZendServer/package/LICENSE delete mode 100644 Applications/PHPZendServer/package/UI/ui.yaml delete mode 100644 Applications/PHPZendServer/package/logo.png delete mode 100644 Applications/PHPZendServer/package/manifest.yaml diff --git a/Applications/PHPZendServer/package/Classes/DockerPHPZendServer.yaml b/Applications/PHPZendServer/package/Classes/DockerPHPZendServer.yaml deleted file mode 100644 index 2ada1fb..0000000 --- a/Applications/PHPZendServer/package/Classes/DockerPHPZendServer.yaml +++ /dev/null @@ -1,97 +0,0 @@ -# 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. - -Namespaces: - =: io.murano.apps.docker - std: io.murano - -Name: DockerPHPZendServer - -Extends: DockerApplication - -Properties: - name: - Contract: $.string().notNull() - - publish: - Contract: $.bool().notNull() - Default: true - - password: - Contract: $.string().notNull() - - database: - Contract: $.class(DockerMySQL).notNull() - - dbName: - Contract: $.string().notNull() - - dbUser: - Contract: $.string().notNull() - - dbPass: - Contract: $.string().notNull() - - -Methods: - initialize: - Body: - - $._environment: $.find(std:Environment).require() - - $._scope: switch($.publish, $ => public, not $ => internal) - - - deploy: - Body: - - $.database.deploy() - - $.super($.deploy()) - - - getContainer: - Body: - - $dbLink: $.getConnectionTo($.database, 3306) - - Return: - name: $.name - image: 'php-zendserver' - env: - MYSQL_HOSTNAME: $dbLink.host - MYSQL_PORT: $dbLink.port - MYSQL_USERNAME: $.dbUser - MYSQL_PASSWORD: $.dbPass - MYSQL_DBNAME: $.dbName - ZS_ADMIN_PASSWORD: $.password - ports: - - port: 80 - scope: $._scope - - port: 10081 - scope: $._scope - - - onInstallationStart: - Body: - - $._environment.reporter.report($this, 'Installing PHPZendServer') - - - onInstallationFinish: - Body: - - If: $.publish - Then: - - $adminEndpoints: $.applicationEndpoints.where($.scope = $this._scope and $.containerPort = 10081). - select(format('http://{0}:{1}', $.address, $.port)) - - $endpoints: $.applicationEndpoints.where($.scope = $this._scope and $.containerPort = 80). - select(format('http://{0}:{1}', $.address, $.port)) - - $._environment.reporter.report($this, 'PHPZendServer {0} Admin UI is available at {1}'.format( - $.name, join(', ', $adminEndpoints))) - - $._environment.reporter.report($this, 'PHPZendServer {0} is available at {1}'.format( - $.name, join(', ', $endpoints))) - - Else: - - $._environment.reporter.report($this, 'PHPZendServer {0} has deployed but is not accessible from outside'.format($.name)) diff --git a/Applications/PHPZendServer/package/LICENSE b/Applications/PHPZendServer/package/LICENSE deleted file mode 100644 index 67db858..0000000 --- a/Applications/PHPZendServer/package/LICENSE +++ /dev/null @@ -1,175 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. diff --git a/Applications/PHPZendServer/package/UI/ui.yaml b/Applications/PHPZendServer/package/UI/ui.yaml deleted file mode 100644 index 7b36995..0000000 --- a/Applications/PHPZendServer/package/UI/ui.yaml +++ /dev/null @@ -1,92 +0,0 @@ -# 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. - -Version: 2 - -Application: - ?: - type: io.murano.apps.docker.DockerPHPZendServer - name: $.appConfiguration.name - host: $.appConfiguration.host - publish: $.appConfiguration.publish - password: $.appConfiguration.password - database: $.dbConfig.database - dbName: $.dbConfig.dbName - dbUser: $.dbConfig.dbUser - dbPass: $.dbConfig.dbPass - - -Forms: - - appConfiguration: - fields: - - name: license - type: string - description: Apache License, Version 2.0 - hidden: true - required: false - - name: name - type: string - label: Application Name - initial: DockerPHP-ZendServer - description: >- - Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and - underline are allowed - - name: host - type: - - io.murano.apps.docker.kubernetes.KubernetesPod - - io.murano.apps.docker.DockerStandaloneHost - label: Container Host - description: >- - Select an instance of Docker contaniner hosting provider to run the app - - name: password - type: password - label: Admin Password - description: >- - Password for admin user in ZendServer - - name: publish - type: boolean - label: Visible from outside - initial: true - required: false - description: >- - Check if you intend to access application from the Internet - - - dbConfig: - fields: - - name: database - type: io.murano.apps.docker.DockerMySQL - label: MySQL instance - required: true - description: >- - Please select existing MySQL instance or add a new one - - - name: dbName - type: string - label: MySQL database - required: true - description: >- - Please specify a MySQL database name to connect to - - - name: dbUser - type: string - label: MySQL user name - initial: admin - required: true - description: >- - Please specify a MySQL user - - - name: dbPass - type: password - label: MySQL user pass - required: true - description: >- - Please specify a MySQL user password diff --git a/Applications/PHPZendServer/package/logo.png b/Applications/PHPZendServer/package/logo.png deleted file mode 100644 index 4cf28d983e9ace71644c60a17c6be7a97c4e56a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3347 zcmbVPc|25m8=quLp;QvDOd~?ZEN0Boc*P8*lBJQMEVCSDFpF8NMU)niD{d+&r8FrM zg=9-^5=BO?wIV9}z82{n-Ma7l$Nlujdp@6Yp5OC3&-dA%-}#)=PWyJMs%Wc#Kp<87 zT_hJ7b&}n7%5t)2)57t?GO|%0D+c= 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 OH^ts|A4y{46Z0RLqSO}v diff --git a/Applications/PHPZendServer/package/manifest.yaml b/Applications/PHPZendServer/package/manifest.yaml deleted file mode 100644 index cfc91c8..0000000 --- a/Applications/PHPZendServer/package/manifest.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# 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. - -Format: 1.0 -Type: Application -FullName: io.murano.apps.docker.DockerPHPZendServer -Name: Docker PHP-ZendServer -Description: | - Zend Server provides a complete, reliable and secure PHP stack, bundling over 80 of the most popular PHP extensions and libraries. Whether on Apache, nginx or IIS - Zend Server provides you with a consistent PHP environment across all major operating systems, for both development and production. -Author: 'Mirantis, Inc' -Tags: [docker, application, PHPZendServer] -Classes: - io.murano.apps.docker.DockerPHPZendServer: DockerPHPZendServer.yaml