Rebase to MariaDB 10.4.25 and Galera 26.4.11

Constraining the stream to a Fedora 35, beacuse F<35 reached EOL, and F>35 requires OpenSSL 3
Rebase to MariaDB 10.4.20
2022-07-17 11:28:35 +02:00 · 2021-07-02 02:10:42 +02:00 · 2021-05-11 04:52:15 +02:00 · 2021-03-05 11:23:10 +01:00 · 2021-02-25 03:19:16 +01:00 · 2020-11-12 13:33:46 +01:00
32 changed files with 65 additions and 2299 deletions
--- a/56
+++ b/56
@ -1,56 +0,0 @@
 FROM baseruntime/baseruntime:latest
 ENV NAME=mariadb \
    ARCH=x86_64 \
    VERSION=0 \
    RELEASE=1 \
    MARIADB_VERSION="10.1.21" \
    HOME=/var/lib/mysql \
    SUMMARY="MariaDB 10.1 SQL database server" \
    DESCRIPTION="MariaDB is a multi-user, multi-threaded SQL database server. The container \
 image provides a containerized packaging of the MariaDB mysqld daemon and client application. \
 The mysqld server daemon accepts connections from clients and provides access to content from \
 MariaDB databases on behalf of the clients."
 LABEL MAINTAINER "Matus Kocka" <mkocka@redhat.com>
 LABEL summary="MariaDB is a multi-user, multi-threaded SQL database server" \
      name="$FGC/$NAME" \
      version="$VERSION" \
      release="$RELEASE.$DISTTAG" \
      architecture="$ARCH" \
      description="MariaDB is a multi-user, multi-threaded SQL database server." \
      vendor="Fedora Project" \
      com.redhat.component="$NAME" \
      usage="docker run -e MYSQL_USER=<user_name> -e MYSQL_PASSWORD=<password> -e MYSQL_DATABASE=<db_name> -e MYSQL_ROOT_PASSWORD=<root_password> -p 3306:3306 mariadb" \
      org.fedoraproject.component="mariadb" \
      authoritative-source-url="registry.fedoraproject.org" \
      io.k8s.description="MariaDB is a multi-user, multi-threaded SQL database server" \
      io.k8s.display-name="MariaDB 10.1" \
      io.openshift.expose-services="3306:mysql" \
      io.openshift.tags="database,mysql,mariadb,mariadb101,galera" 
 RUN INSTALL_PKGS="rsync tar gettext hostname bind-utils python3 policycoreutils" && \
    microdnf --nodocs install mariadb mariadb-server -y && \
    microdnf --nodocs install $INSTALL_PKGS -y && \
    microdnf clean all && \
    mkdir -p /var/lib/mysql/data && chown -R mysql.0 /var/lib/mysql && \
    test "$(id mysql)" = "uid=27(mysql) gid=27(mysql) groups=27(mysql)"
 ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/mysql \
    MYSQL_PREFIX=/usr
 EXPOSE 3306
 COPY root /
 RUN rm -rf /etc/my.cnf.d/*
 RUN /usr/libexec/container-setup
 VOLUME ["/var/lib/mysql/data"]
 USER 27
 ENTRYPOINT ["container-entrypoint"]
 CMD ["run-mysqld"]
--- a/674
+++ b/674
@ -1,674 +0,0 @@
 GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007
 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
                            Preamble
  The GNU General Public License is a free, copyleft license for
 software and other kinds of works.
  The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
 the GNU General Public License is intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
 software for all its users.  We, the Free Software Foundation, use the
 GNU General Public License for most of our software; it applies also to
 any other work released this way by its authors.  You can apply it to
 your programs, too.
  When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
 them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
  To protect your rights, we need to prevent others from denying you
 these rights or asking you to surrender the rights.  Therefore, you have
 certain responsibilities if you distribute copies of the software, or if
 you modify it: responsibilities to respect the freedom of others.
  For example, if you distribute copies of such a program, whether
 gratis or for a fee, you must pass on to the recipients the same
 freedoms that you received.  You must make sure that they, too, receive
 or can get the source code.  And you must show them these terms so they
 know their rights.
  Developers that use the GNU GPL protect your rights with two steps:
 (1) assert copyright on the software, and (2) offer you this License
 giving you legal permission to copy, distribute and/or modify it.
  For the developers' and authors' protection, the GPL clearly explains
 that there is no warranty for this free software.  For both users' and
 authors' sake, the GPL requires that modified versions be marked as
 changed, so that their problems will not be attributed erroneously to
 authors of previous versions.
  Some devices are designed to deny users access to install or run
 modified versions of the software inside them, although the manufacturer
 can do so.  This is fundamentally incompatible with the aim of
 protecting users' freedom to change the software.  The systematic
 pattern of such abuse occurs in the area of products for individuals to
 use, which is precisely where it is most unacceptable.  Therefore, we
 have designed this version of the GPL to prohibit the practice for those
 products.  If such problems arise substantially in other domains, we
 stand ready to extend this provision to those domains in future versions
 of the GPL, as needed to protect the freedom of users.
  Finally, every program is threatened constantly by software patents.
 States should not allow patents to restrict development and use of
 software on general-purpose computers, but in those that do, we wish to
 avoid the special danger that patents applied to a free program could
 make it effectively proprietary.  To prevent this, the GPL assures that
 patents cannot be used to render the program non-free.
  The precise terms and conditions for copying, distribution and
 modification follow.
                       TERMS AND CONDITIONS
  0. Definitions.
  "This License" refers to version 3 of the GNU General Public License.
  "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
  "The Program" refers to any copyrightable work licensed under this
 License.  Each licensee is addressed as "you".  "Licensees" and
 "recipients" may be individuals or organizations.
  To "modify" a work means to copy from or adapt all or part of the work
 in a fashion requiring copyright permission, other than the making of an
 exact copy.  The resulting work is called a "modified version" of the
 earlier work or a work "based on" the earlier work.
  A "covered work" means either the unmodified Program or a work based
 on the Program.
  To "propagate" a work means to do anything with it that, without
 permission, would make you directly or secondarily liable for
 infringement under applicable copyright law, except executing it on a
 computer or modifying a private copy.  Propagation includes copying,
 distribution (with or without modification), making available to the
 public, and in some countries other activities as well.
  To "convey" a work means any kind of propagation that enables other
 parties to make or receive copies.  Mere interaction with a user through
 a computer network, with no transfer of a copy, is not conveying.
  An interactive user interface displays "Appropriate Legal Notices"
 to the extent that it includes a convenient and prominently visible
 feature that (1) displays an appropriate copyright notice, and (2)
 tells the user that there is no warranty for the work (except to the
 extent that warranties are provided), that licensees may convey the
 work under this License, and how to view a copy of this License.  If
 the interface presents a list of user commands or options, such as a
 menu, a prominent item in the list meets this criterion.
  1. Source Code.
  The "source code" for a work means the preferred form of the work
 for making modifications to it.  "Object code" means any non-source
 form of a work.
  A "Standard Interface" means an interface that either is an official
 standard defined by a recognized standards body, or, in the case of
 interfaces specified for a particular programming language, one that
 is widely used among developers working in that language.
  The "System Libraries" of an executable work include anything, other
 than the work as a whole, that (a) is included in the normal form of
 packaging a Major Component, but which is not part of that Major
 Component, and (b) serves only to enable use of the work with that
 Major Component, or to implement a Standard Interface for which an
 implementation is available to the public in source code form.  A
 "Major Component", in this context, means a major essential component
 (kernel, window system, and so on) of the specific operating system
 (if any) on which the executable work runs, or a compiler used to
 produce the work, or an object code interpreter used to run it.
  The "Corresponding Source" for a work in object code form means all
 the source code needed to generate, install, and (for an executable
 work) run the object code and to modify the work, including scripts to
 control those activities.  However, it does not include the work's
 System Libraries, or general-purpose tools or generally available free
 programs which are used unmodified in performing those activities but
 which are not part of the work.  For example, Corresponding Source
 includes interface definition files associated with source files for
 the work, and the source code for shared libraries and dynamically
 linked subprograms that the work is specifically designed to require,
 such as by intimate data communication or control flow between those
 subprograms and other parts of the work.
  The Corresponding Source need not include anything that users
 can regenerate automatically from other parts of the Corresponding
 Source.
  The Corresponding Source for a work in source code form is that
 same work.
  2. Basic Permissions.
  All rights granted under this License are granted for the term of
 copyright on the Program, and are irrevocable provided the stated
 conditions are met.  This License explicitly affirms your unlimited
 permission to run the unmodified Program.  The output from running a
 covered work is covered by this License only if the output, given its
 content, constitutes a covered work.  This License acknowledges your
 rights of fair use or other equivalent, as provided by copyright law.
  You may make, run and propagate covered works that you do not
 convey, without conditions so long as your license otherwise remains
 in force.  You may convey covered works to others for the sole purpose
 of having them make modifications exclusively for you, or provide you
 with facilities for running those works, provided that you comply with
 the terms of this License in conveying all material for which you do
 not control copyright.  Those thus making or running the covered works
 for you must do so exclusively on your behalf, under your direction
 and control, on terms that prohibit them from making any copies of
 your copyrighted material outside their relationship with you.
  Conveying under any other circumstances is permitted solely under
 the conditions stated below.  Sublicensing is not allowed; section 10
 makes it unnecessary.
  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
  No covered work shall be deemed part of an effective technological
 measure under any applicable law fulfilling obligations under article
 11 of the WIPO copyright treaty adopted on 20 December 1996, or
 similar laws prohibiting or restricting circumvention of such
 measures.
  When you convey a covered work, you waive any legal power to forbid
 circumvention of technological measures to the extent such circumvention
 is effected by exercising rights under this License with respect to
 the covered work, and you disclaim any intention to limit operation or
 modification of the work as a means of enforcing, against the work's
 users, your or third parties' legal rights to forbid circumvention of
 technological measures.
  4. Conveying Verbatim Copies.
  You may convey verbatim copies of the Program's source code as you
 receive it, in any medium, provided that you conspicuously and
 appropriately publish on each copy an appropriate copyright notice;
 keep intact all notices stating that this License and any
 non-permissive terms added in accord with section 7 apply to the code;
 keep intact all notices of the absence of any warranty; and give all
 recipients a copy of this License along with the Program.
  You may charge any price or no price for each copy that you convey,
 and you may offer support or warranty protection for a fee.
  5. Conveying Modified Source Versions.
  You may convey a work based on the Program, or the modifications to
 produce it from the Program, in the form of source code under the
 terms of section 4, provided that you also meet all of these conditions:
    a) The work must carry prominent notices stating that you modified
    it, and giving a relevant date.
    b) The work must carry prominent notices stating that it is
    released under this License and any conditions added under section
    7.  This requirement modifies the requirement in section 4 to
    "keep intact all notices".
    c) You must license the entire work, as a whole, under this
    License to anyone who comes into possession of a copy.  This
    License will therefore apply, along with any applicable section 7
    additional terms, to the whole of the work, and all its parts,
    regardless of how they are packaged.  This License gives no
    permission to license the work in any other way, but it does not
    invalidate such permission if you have separately received it.
    d) If the work has interactive user interfaces, each must display
    Appropriate Legal Notices; however, if the Program has interactive
    interfaces that do not display Appropriate Legal Notices, your
    work need not make them do so.
  A compilation of a covered work with other separate and independent
 works, which are not by their nature extensions of the covered work,
 and which are not combined with it such as to form a larger program,
 in or on a volume of a storage or distribution medium, is called an
 "aggregate" if the compilation and its resulting copyright are not
 used to limit the access or legal rights of the compilation's users
 beyond what the individual works permit.  Inclusion of a covered work
 in an aggregate does not cause this License to apply to the other
 parts of the aggregate.
  6. Conveying Non-Source Forms.
  You may convey a covered work in object code form under the terms
 of sections 4 and 5, provided that you also convey the
 machine-readable Corresponding Source under the terms of this License,
 in one of these ways:
    a) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by the
    Corresponding Source fixed on a durable physical medium
    customarily used for software interchange.
    b) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by a
    written offer, valid for at least three years and valid for as
    long as you offer spare parts or customer support for that product
    model, to give anyone who possesses the object code either (1) a
    copy of the Corresponding Source for all the software in the
    product that is covered by this License, on a durable physical
    medium customarily used for software interchange, for a price no
    more than your reasonable cost of physically performing this
    conveying of source, or (2) access to copy the
    Corresponding Source from a network server at no charge.
    c) Convey individual copies of the object code with a copy of the
    written offer to provide the Corresponding Source.  This
    alternative is allowed only occasionally and noncommercially, and
    only if you received the object code with such an offer, in accord
    with subsection 6b.
    d) Convey the object code by offering access from a designated
    place (gratis or for a charge), and offer equivalent access to the
    Corresponding Source in the same way through the same place at no
    further charge.  You need not require recipients to copy the
    Corresponding Source along with the object code.  If the place to
    copy the object code is a network server, the Corresponding Source
    may be on a different server (operated by you or a third party)
    that supports equivalent copying facilities, provided you maintain
    clear directions next to the object code saying where to find the
    Corresponding Source.  Regardless of what server hosts the
    Corresponding Source, you remain obligated to ensure that it is
    available for as long as needed to satisfy these requirements.
    e) Convey the object code using peer-to-peer transmission, provided
    you inform other peers where the object code and Corresponding
    Source of the work are being offered to the general public at no
    charge under subsection 6d.
  A separable portion of the object code, whose source code is excluded
 from the Corresponding Source as a System Library, need not be
 included in conveying the object code work.
  A "User Product" is either (1) a "consumer product", which means any
 tangible personal property which is normally used for personal, family,
 or household purposes, or (2) anything designed or sold for incorporation
 into a dwelling.  In determining whether a product is a consumer product,
 doubtful cases shall be resolved in favor of coverage.  For a particular
 product received by a particular user, "normally used" refers to a
 typical or common use of that class of product, regardless of the status
 of the particular user or of the way in which the particular user
 actually uses, or expects or is expected to use, the product.  A product
 is a consumer product regardless of whether the product has substantial
 commercial, industrial or non-consumer uses, unless such uses represent
 the only significant mode of use of the product.
  "Installation Information" for a User Product means any methods,
 procedures, authorization keys, or other information required to install
 and execute modified versions of a covered work in that User Product from
 a modified version of its Corresponding Source.  The information must
 suffice to ensure that the continued functioning of the modified object
 code is in no case prevented or interfered with solely because
 modification has been made.
  If you convey an object code work under this section in, or with, or
 specifically for use in, a User Product, and the conveying occurs as
 part of a transaction in which the right of possession and use of the
 User Product is transferred to the recipient in perpetuity or for a
 fixed term (regardless of how the transaction is characterized), the
 Corresponding Source conveyed under this section must be accompanied
 by the Installation Information.  But this requirement does not apply
 if neither you nor any third party retains the ability to install
 modified object code on the User Product (for example, the work has
 been installed in ROM).
  The requirement to provide Installation Information does not include a
 requirement to continue to provide support service, warranty, or updates
 for a work that has been modified or installed by the recipient, or for
 the User Product in which it has been modified or installed.  Access to a
 network may be denied when the modification itself materially and
 adversely affects the operation of the network or violates the rules and
 protocols for communication across the network.
  Corresponding Source conveyed, and Installation Information provided,
 in accord with this section must be in a format that is publicly
 documented (and with an implementation available to the public in
 source code form), and must require no special password or key for
 unpacking, reading or copying.
  7. Additional Terms.
  "Additional permissions" are terms that supplement the terms of this
 License by making exceptions from one or more of its conditions.
 Additional permissions that are applicable to the entire Program shall
 be treated as though they were included in this License, to the extent
 that they are valid under applicable law.  If additional permissions
 apply only to part of the Program, that part may be used separately
 under those permissions, but the entire Program remains governed by
 this License without regard to the additional permissions.
  When you convey a copy of a covered work, you may at your option
 remove any additional permissions from that copy, or from any part of
 it.  (Additional permissions may be written to require their own
 removal in certain cases when you modify the work.)  You may place
 additional permissions on material, added by you to a covered work,
 for which you have or can give appropriate copyright permission.
  Notwithstanding any other provision of this License, for material you
 add to a covered work, you may (if authorized by the copyright holders of
 that material) supplement the terms of this License with terms:
    a) Disclaiming warranty or limiting liability differently from the
    terms of sections 15 and 16 of this License; or
    b) Requiring preservation of specified reasonable legal notices or
    author attributions in that material or in the Appropriate Legal
    Notices displayed by works containing it; or
    c) Prohibiting misrepresentation of the origin of that material, or
    requiring that modified versions of such material be marked in
    reasonable ways as different from the original version; or
    d) Limiting the use for publicity purposes of names of licensors or
    authors of the material; or
    e) Declining to grant rights under trademark law for use of some
    trade names, trademarks, or service marks; or
    f) Requiring indemnification of licensors and authors of that
    material by anyone who conveys the material (or modified versions of
    it) with contractual assumptions of liability to the recipient, for
    any liability that these contractual assumptions directly impose on
    those licensors and authors.
  All other non-permissive additional terms are considered "further
 restrictions" within the meaning of section 10.  If the Program as you
 received it, or any part of it, contains a notice stating that it is
 governed by this License along with a term that is a further
 restriction, you may remove that term.  If a license document contains
 a further restriction but permits relicensing or conveying under this
 License, you may add to a covered work material governed by the terms
 of that license document, provided that the further restriction does
 not survive such relicensing or conveying.
  If you add terms to a covered work in accord with this section, you
 must place, in the relevant source files, a statement of the
 additional terms that apply to those files, or a notice indicating
 where to find the applicable terms.
  Additional terms, permissive or non-permissive, may be stated in the
 form of a separately written license, or stated as exceptions;
 the above requirements apply either way.
  8. Termination.
  You may not propagate or modify a covered work except as expressly
 provided under this License.  Any attempt otherwise to propagate or
 modify it is void, and will automatically terminate your rights under
 this License (including any patent licenses granted under the third
 paragraph of section 11).
  However, if you cease all violation of this License, then your
 license from a particular copyright holder is reinstated (a)
 provisionally, unless and until the copyright holder explicitly and
 finally terminates your license, and (b) permanently, if the copyright
 holder fails to notify you of the violation by some reasonable means
 prior to 60 days after the cessation.
  Moreover, your license from a particular copyright holder is
 reinstated permanently if the copyright holder notifies you of the
 violation by some reasonable means, this is the first time you have
 received notice of violation of this License (for any work) from that
 copyright holder, and you cure the violation prior to 30 days after
 your receipt of the notice.
  Termination of your rights under this section does not terminate the
 licenses of parties who have received copies or rights from you under
 this License.  If your rights have been terminated and not permanently
 reinstated, you do not qualify to receive new licenses for the same
 material under section 10.
  9. Acceptance Not Required for Having Copies.
  You are not required to accept this License in order to receive or
 run a copy of the Program.  Ancillary propagation of a covered work
 occurring solely as a consequence of using peer-to-peer transmission
 to receive a copy likewise does not require acceptance.  However,
 nothing other than this License grants you permission to propagate or
 modify any covered work.  These actions infringe copyright if you do
 not accept this License.  Therefore, by modifying or propagating a
 covered work, you indicate your acceptance of this License to do so.
  10. Automatic Licensing of Downstream Recipients.
  Each time you convey a covered work, the recipient automatically
 receives a license from the original licensors, to run, modify and
 propagate that work, subject to this License.  You are not responsible
 for enforcing compliance by third parties with this License.
  An "entity transaction" is a transaction transferring control of an
 organization, or substantially all assets of one, or subdividing an
 organization, or merging organizations.  If propagation of a covered
 work results from an entity transaction, each party to that
 transaction who receives a copy of the work also receives whatever
 licenses to the work the party's predecessor in interest had or could
 give under the previous paragraph, plus a right to possession of the
 Corresponding Source of the work from the predecessor in interest, if
 the predecessor has it or can get it with reasonable efforts.
  You may not impose any further restrictions on the exercise of the
 rights granted or affirmed under this License.  For example, you may
 not impose a license fee, royalty, or other charge for exercise of
 rights granted under this License, and you may not initiate litigation
 (including a cross-claim or counterclaim in a lawsuit) alleging that
 any patent claim is infringed by making, using, selling, offering for
 sale, or importing the Program or any portion of it.
  11. Patents.
  A "contributor" is a copyright holder who authorizes use under this
 License of the Program or a work on which the Program is based.  The
 work thus licensed is called the contributor's "contributor version".
  A contributor's "essential patent claims" are all patent claims
 owned or controlled by the contributor, whether already acquired or
 hereafter acquired, that would be infringed by some manner, permitted
 by this License, of making, using, or selling its contributor version,
 but do not include claims that would be infringed only as a
 consequence of further modification of the contributor version.  For
 purposes of this definition, "control" includes the right to grant
 patent sublicenses in a manner consistent with the requirements of
 this License.
  Each contributor grants you a non-exclusive, worldwide, royalty-free
 patent license under the contributor's essential patent claims, to
 make, use, sell, offer for sale, import and otherwise run, modify and
 propagate the contents of its contributor version.
  In the following three paragraphs, a "patent license" is any express
 agreement or commitment, however denominated, not to enforce a patent
 (such as an express permission to practice a patent or covenant not to
 sue for patent infringement).  To "grant" such a patent license to a
 party means to make such an agreement or commitment not to enforce a
 patent against the party.
  If you convey a covered work, knowingly relying on a patent license,
 and the Corresponding Source of the work is not available for anyone
 to copy, free of charge and under the terms of this License, through a
 publicly available network server or other readily accessible means,
 then you must either (1) cause the Corresponding Source to be so
 available, or (2) arrange to deprive yourself of the benefit of the
 patent license for this particular work, or (3) arrange, in a manner
 consistent with the requirements of this License, to extend the patent
 license to downstream recipients.  "Knowingly relying" means you have
 actual knowledge that, but for the patent license, your conveying the
 covered work in a country, or your recipient's use of the covered work
 in a country, would infringe one or more identifiable patents in that
 country that you have reason to believe are valid.
  If, pursuant to or in connection with a single transaction or
 arrangement, you convey, or propagate by procuring conveyance of, a
 covered work, and grant a patent license to some of the parties
 receiving the covered work authorizing them to use, propagate, modify
 or convey a specific copy of the covered work, then the patent license
 you grant is automatically extended to all recipients of the covered
 work and works based on it.
  A patent license is "discriminatory" if it does not include within
 the scope of its coverage, prohibits the exercise of, or is
 conditioned on the non-exercise of one or more of the rights that are
 specifically granted under this License.  You may not convey a covered
 work if you are a party to an arrangement with a third party that is
 in the business of distributing software, under which you make payment
 to the third party based on the extent of your activity of conveying
 the work, and under which the third party grants, to any of the
 parties who would receive the covered work from you, a discriminatory
 patent license (a) in connection with copies of the covered work
 conveyed by you (or copies made from those copies), or (b) primarily
 for and in connection with specific products or compilations that
 contain the covered work, unless you entered into that arrangement,
 or that patent license was granted, prior to 28 March 2007.
  Nothing in this License shall be construed as excluding or limiting
 any implied license or other defenses to infringement that may
 otherwise be available to you under applicable patent law.
  12. No Surrender of Others' Freedom.
  If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
 excuse you from the conditions of this License.  If you cannot convey a
 covered work so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you may
 not convey it at all.  For example, if you agree to terms that obligate you
 to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
  13. Use with the GNU Affero General Public License.
  Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
 under version 3 of the GNU Affero General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
 but the special requirements of the GNU Affero General Public License,
 section 13, concerning interaction through a network will apply to the
 combination as such.
  14. Revised Versions of this License.
  The Free Software Foundation may publish revised and/or new versions of
 the GNU General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
  Each version is given a distinguishing version number.  If the
 Program specifies that a certain numbered version of the GNU General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
 GNU General Public License, you may choose any version ever published
 by the Free Software Foundation.
  If the Program specifies that a proxy can decide which future
 versions of the GNU General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
  Later license versions may give you additional or different
 permissions.  However, no additional obligations are imposed on any
 author or copyright holder as a result of your choosing to follow a
 later version.
  15. Disclaimer of Warranty.
  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
 APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
 HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
 THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
 IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
 ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
  16. Limitation of Liability.
  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
 THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
 GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
 USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
 DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
 PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
 EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGES.
  17. Interpretation of Sections 15 and 16.
  If the disclaimer of warranty and limitation of liability provided
 above cannot be given local legal effect according to their terms,
 reviewing courts shall apply local law that most closely approximates
 an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
                     END OF TERMS AND CONDITIONS
            How to Apply These Terms to Your New Programs
  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
 free software which everyone can redistribute and change under these terms.
  To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
    {one line to give the program's name and a brief idea of what it does.}
    Copyright (C) {year}  {name of author}
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Also add information on how to contact you by electronic and paper mail.
  If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
    {project}  Copyright (C) {year}  {fullname}
    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.
 The hypothetical commands `show w' and `show c' should show the appropriate
 parts of the General Public License.  Of course, your program's commands
 might be different; for a GUI interface, you would use an "about box".
  You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
 <http://www.gnu.org/licenses/>.
  The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
 <http://www.gnu.org/philosophy/why-not-lgpl.html>.
--- a/14
+++ b/14
@ -1,14 +0,0 @@
 IMAGE_NAME = mariadb
 MODULEMDURL=file://mariadb.yaml
 default: run
 build:
 	docker build --tag=$(IMAGE_NAME) .
 run: build
 	docker run -d $(IMAGE_NAME)
 test: build
 	cd tests; MODULE=docker MODULEMD=$(MODULEMDURL) URL="docker=$(IMAGE_NAME)" make all
--- a/README.md
+++ b/README.md
@ -1,24 +0,0 @@
 # MariaDB
 [**Package DB** (owner)](https://admin.fedoraproject.org/pkgdb/package/modules/mariadb/) |
 [**F26 modulemd** (source)](http://pkgs.fedoraproject.org/cgit/modules/mariadb.git/tree/mariadb.yaml?h=f26) |
 [**PDC** (result)](https://pdc.fedoraproject.org/rest_api/v1/unreleasedvariants/?active=True&variant_name=mariadb)
 MariaDB is a community developed branch of MySQL. MariaDB is a multi-user, multi-threaded SQL database server. It is a client/server implementation consisting of a server daemon (mysqld) and many different client programs and libraries. The base package contains the standard MariaDB/MySQL client programs and generic MySQL files.
 ## Current state
 | State | Description |
 |-------|-------------|
 | ✓ YES | **Build passes** in the infra (all build deps are ok) |
 | ✓ YES | **Installs** on the Base Runtime (all runtime deps are ok) |
 | ✗ NO  | **No bootstrap** - uses only proper modules |
 | ✓ YES | General **tests are in dist-git** |
 | ✓ YES | General **tests pass** |
 | ✗ NO  | Meets the **Fedora Module Packaging Guidelines** |
 ### Notes
 See [**README**](https://github.com/container-images/mariadb) on github for more details. 
 See [**hub.docker**](https://hub.docker.com/r/modularitycontainers/mariadb/) for Dockerimage. 
--- a/mariadb.yaml
+++ b/mariadb.yaml
@ -1,57 +1,67 @@
 ---
 document: modulemd
-version: 1
+version: 2
 data:
-    summary: MariaDB Module
+  summary: 'MariaDB: a very fast and robust SQL database server'
-    description: MariaDB is a community developed branch of MySQL.
+  description: >-
-                 MariaDB is a multi-user, multi-threaded SQL database server.
+    MariaDB is a community developed branch of MySQL. MariaDB is a multi-user, multi-threaded
-                 It is a client/server implementation consisting of a server
+    SQL database server. It is a client/server implementation consisting of a server
-                 daemon (mysqld) and many different client programs and
+    daemon (mysqld) and many different client programs and libraries. The base package
-                 libraries. The base package contains the standard
+    contains the standard MariaDB/MySQL client programs and generic MySQL files.
-                 MariaDB/MySQL client programs and generic MySQL files.
+  license:
-    license:
+    module:
-        module: [MIT]
+    - MIT
-    dependencies:
+
-        buildrequires:
+
-            bootstrap: master
+
-        requires:
+  dependencies:
-            platform: master
+  - buildrequires:
-            host: master
+      platform: [f35]
-            networking-base: master
+    requires:
-    references:
+      platform: [f35]
-        community: https://docs.pagure.org/modularity/
+
-        documentation: https://github.com/container-images/mariadb/
+
-        tracker: https://github.com/modularity-modules/mariadb
+
-    profiles:
+  api:
-        default:
+    rpms:
-            rpms:
+    - mariadb-server
-                - mariadb
+    - mariadb
-                - mariadb-server
+
-        server:
+
-            rpms:
+
-                - mariadb-server
+  profiles:
-        client:
+    server:
-            rpms:
+      description: Base server.
-                - mariadb
+      rpms:
-    api:
+      - mariadb-server
-        rpms:
+    client:
-            - mariadb
+      description: Client.
-            - mariadb-server
+      rpms:
-    filter:
+      - mariadb
-        rpms:
+    galera:
-            - mariadb-bench
+      description: Server plus replication engine.
-            - mariadb-server-galera
+      rpms:
-    buildopts:
+      - mariadb-server
-        rpms:
+      - mariadb-server-galera
-            macros: |
+    devel:
-                %runselftest 0
+      description: Devel package.
-    components:
+      rpms:
-        rpms:
+      - mariadb-devel
-            # mariadb-10.2.9-3.fc28
+
-            mariadb:
+
-                rationale: MariaDB  package.
+
-                ref: 81336ab97e91b46dc459b15c24fa124cc56370bc
+  buildopts:
-            # jemalloc-4.5.0-4.fc27
+    rpms:
-            jemalloc:
+      macros: |
-                rationale: Generated.
+        %runselftest 0
-                ref: a1dce39784b3c9cc2bef14027ab9bbc41fdb8c0c
+        %ignore_testsuite_result 1
  components:
    rpms:
      mariadb:
        rationale: The main component.
        ref: 10.4
      galera:
        rationale: Galera package for replication.
        ref: mariadb-10.4
--- a/root/etc/my.cnf
+++ b/root/etc/my.cnf
@ -1,12 +0,0 @@
 [mysqld]
 # Disabling symbolic-links is recommended to prevent assorted security risks
 symbolic-links = 0
 # http://www.percona.com/blog/2008/05/31/dns-achilles-heel-mysql-installation/
 skip_name_resolve
 # http://www.chriscalender.com/ignoring-the-lostfound-directory-in-your-datadir/
 ignore-db-dir=lost+found
 !includedir /etc/my.cnf.d
--- a/root/help.1
+++ b/root/help.1
@ -1,332 +0,0 @@
 .\"t
 .\" WARNING: Do not edit this file manually, it is generated from README.md automatically.
 .\"
 .\"t
 .\" Automatically generated by Pandoc 1.16.0.2
 .\"
 .TH "MARIADB\-101\-RHEL7" "1" "February 22, 2017" "Container Image Pages" ""
 .hy
 .SH MariaDB Docker image
 .PP
 This container image includes MariaDB server 10.1 for OpenShift and
 general usage.
 Users can choose between RHEL and CentOS based images.
 .PP
 Dockerfile for CentOS is called Dockerfile, Dockerfile for RHEL is
 called Dockerfile.rhel7.
 .SS Environment variables and volumes
 .PP
 The image recognizes the following environment variables that you can
 set during initialization by passing \f[C]\-e\ VAR=VALUE\f[] to the
 Docker run command.
 .PP
 .TS
 tab(@);
 l l.
 T{
 Variable name
 T}@T{
 Description
 T}
 _
 T{
 \f[C]MYSQL_USER\f[]
 T}@T{
 User name for MySQL account to be created
 T}
 T{
 \f[C]MYSQL_PASSWORD\f[]
 T}@T{
 Password for the user account
 T}
 T{
 \f[C]MYSQL_DATABASE\f[]
 T}@T{
 Database name
 T}
 T{
 \f[C]MYSQL_ROOT_PASSWORD\f[]
 T}@T{
 Password for the root user (optional)
 T}
 .TE
 .PP
 The following environment variables influence the MySQL configuration
 file.
 They are all optional.
 .PP
 .TS
 tab(@);
 lw(17.2n) lw(35.5n) lw(17.2n).
 T{
 Variable name
 T}@T{
 Description
 T}@T{
 Default
 T}
 _
 T{
 \f[C]MYSQL_LOWER_CASE_TABLE_NAMES\f[]
 T}@T{
 Sets how the table names are stored and compared
 T}@T{
 0
 T}
 T{
 \f[C]MYSQL_MAX_CONNECTIONS\f[]
 T}@T{
 The maximum permitted number of simultaneous client connections
 T}@T{
 151
 T}
 T{
 \f[C]MYSQL_MAX_ALLOWED_PACKET\f[]
 T}@T{
 The maximum size of one packet or any generated/intermediate string
 T}@T{
 200M
 T}
 T{
 \f[C]MYSQL_FT_MIN_WORD_LEN\f[]
 T}@T{
 The minimum length of the word to be included in a FULLTEXT index
 T}@T{
 4
 T}
 T{
 \f[C]MYSQL_FT_MAX_WORD_LEN\f[]
 T}@T{
 The maximum length of the word to be included in a FULLTEXT index
 T}@T{
 20
 T}
 T{
 \f[C]MYSQL_AIO\f[]
 T}@T{
 Controls the \f[C]innodb_use_native_aio\f[] setting value in case the
 native AIO is broken.
 See http://help.directadmin.com/item.php?id=529
 T}@T{
 1
 T}
 T{
 \f[C]MYSQL_TABLE_OPEN_CACHE\f[]
 T}@T{
 The number of open tables for all threads
 T}@T{
 400
 T}
 T{
 \f[C]MYSQL_KEY_BUFFER_SIZE\f[]
 T}@T{
 The size of the buffer used for index blocks
 T}@T{
 32M (or 10% of available memory)
 T}
 T{
 \f[C]MYSQL_SORT_BUFFER_SIZE\f[]
 T}@T{
 The size of the buffer used for sorting
 T}@T{
 256K
 T}
 T{
 \f[C]MYSQL_READ_BUFFER_SIZE\f[]
 T}@T{
 The size of the buffer used for a sequential scan
 T}@T{
 8M (or 5% of available memory)
 T}
 T{
 \f[C]MYSQL_INNODB_BUFFER_POOL_SIZE\f[]
 T}@T{
 The size of the buffer pool where InnoDB caches table and index data
 T}@T{
 32M (or 50% of available memory)
 T}
 T{
 \f[C]MYSQL_INNODB_LOG_FILE_SIZE\f[]
 T}@T{
 The size of each log file in a log group
 T}@T{
 8M (or 15% of available available)
 T}
 T{
 \f[C]MYSQL_INNODB_LOG_BUFFER_SIZE\f[]
 T}@T{
 The size of the buffer that InnoDB uses to write to the log files on
 disk
 T}@T{
 8M (or 15% of available memory)
 T}
 T{
 \f[C]MYSQL_DEFAULTS_FILE\f[]
 T}@T{
 Point to an alternative configuration file
 T}@T{
 /etc/my.cnf
 T}
 T{
 \f[C]MYSQL_BINLOG_FORMAT\f[]
 T}@T{
 Set sets the binlog format, supported values are \f[C]row\f[] and
 \f[C]statement\f[]
 T}@T{
 statement
 T}
 .TE
 .PP
 You can also set the following mount points by passing the
 \f[C]\-v\ /host:/container\f[] flag to Docker.
 .PP
 .TS
 tab(@);
 l l.
 T{
 Volume mount point
 T}@T{
 Description
 T}
 _
 T{
 \f[C]/var/lib/mysql/data\f[]
 T}@T{
 MySQL data directory
 T}
 .TE
 .PP
 \f[B]Notice: When mouting a directory from the host into the container,
 ensure that the mounted directory has the appropriate permissions and
 that the owner and group of the directory matches the user UID or name
 which is running inside the container.\f[]
 .SS Usage
 .PP
 For this, we will assume that you are using the
 \f[C]rhscl/mariadb\-100\-rhel7\f[] image.
 If you want to set only the mandatory environment variables and not
 store the database in a host directory, execute the following command:
 .IP
 .nf
 \f[C]
 $\ docker\ run\ \-d\ \-\-name\ mariadb_database\ \-e\ MYSQL_USER=user\ \-e\ MYSQL_PASSWORD=pass\ \-e\ MYSQL_DATABASE=db\ \-p\ 3306:3306\ rhscl/mariadb\-100\-rhel7
 \f[]
 .fi
 .PP
 This will create a container named \f[C]mariadb_database\f[] running
 MySQL with database \f[C]db\f[] and user with credentials
 \f[C]user:pass\f[].
 Port 3306 will be exposed and mapped to the host.
 If you want your database to be persistent across container executions,
 also add a \f[C]\-v\ /host/db/path:/var/lib/mysql/data\f[] argument.
 This will be the MySQL data directory.
 .PP
 If the database directory is not initialized, the entrypoint script will
 first run
 \f[C]mysql_install_db\f[] (https://dev.mysql.com/doc/refman/5.6/en/mysql-install-db.html)
 and setup necessary database users and passwords.
 After the database is initialized, or if it was already present,
 \f[C]mysqld\f[] is executed and will run as PID 1.
 You can stop the detached container by running
 \f[C]docker\ stop\ mariadb_database\f[].
 .SS MariaDB auto\-tuning
 .PP
 When the MySQL image is run with the \f[C]\-\-memory\f[] parameter set
 and you didn\[aq]t specify value for some parameters, their values will
 be automatically calculated based on the available memory.
 .PP
 .TS
 tab(@);
 l l l.
 T{
 Variable name
 T}@T{
 Configuration parameter
 T}@T{
 Relative value
 T}
 _
 T{
 \f[C]MYSQL_KEY_BUFFER_SIZE\f[]
 T}@T{
 \f[C]key_buffer_size\f[]
 T}@T{
 10%
 T}
 T{
 \f[C]MYSQL_READ_BUFFER_SIZE\f[]
 T}@T{
 \f[C]read_buffer_size\f[]
 T}@T{
 5%
 T}
 T{
 \f[C]MYSQL_INNODB_BUFFER_POOL_SIZE\f[]
 T}@T{
 \f[C]innodb_buffer_pool_size\f[]
 T}@T{
 50%
 T}
 T{
 \f[C]MYSQL_INNODB_LOG_FILE_SIZE\f[]
 T}@T{
 \f[C]innodb_log_file_size\f[]
 T}@T{
 15%
 T}
 T{
 \f[C]MYSQL_INNODB_LOG_BUFFER_SIZE\f[]
 T}@T{
 \f[C]innodb_log_buffer_size\f[]
 T}@T{
 15%
 T}
 .TE
 .SS MySQL root user
 .PP
 The root user has no password set by default, only allowing local
 connections.
 You can set it by setting the \f[C]MYSQL_ROOT_PASSWORD\f[] environment
 variable.
 This will allow you to login to the root account remotely.
 Local connections will still not require a password.
 .PP
 To disable remote root access, simply unset \f[C]MYSQL_ROOT_PASSWORD\f[]
 and restart the container.
 .SS Changing passwords
 .PP
 Since passwords are part of the image configuration, the only supported
 method to change passwords for the database user (\f[C]MYSQL_USER\f[])
 and root user is by changing the environment variables
 \f[C]MYSQL_PASSWORD\f[] and \f[C]MYSQL_ROOT_PASSWORD\f[], respectively.
 .PP
 Changing database passwords through SQL statements or any way other than
 through the environment variables aforementioned will cause a mismatch
 between the values stored in the variables and the actual passwords.
 Whenever a database container starts it will reset the passwords to the
 values stored in the environment variables.
 .SS Default my.cnf file
 .PP
 With environment variables we are able to customize a lot of different
 parameters or configurations for the mysql bootstrap configurations.
 If you\[aq]d prefer to use your own configuration file, you can override
 the \f[C]MYSQL_DEFAULTS_FILE\f[] env variable with the full path of the
 file you wish to use.
 For example, the default location is \f[C]/etc/my.cnf\f[] but you can
 change it to \f[C]/etc/mysql/my.cnf\f[] by setting
 \f[C]MYSQL_DEFAULTS_FILE=/etc/mysql/my.cnf\f[]
 .SS Changing the replication binlog_format
 .PP
 Some applications may wish to use \f[C]row\f[] binlog_formats (for
 example, those built with change\-data\-capture in mind).
 The default replication/binlog format is \f[C]statement\f[] but to
 change it you can set the \f[C]MYSQL_BINLOG_FORMAT\f[] environment
 variable.
 For example \f[C]MYSQL_BINLOG_FORMAT=row\f[].
 Now when you run the database with \f[C]master\f[] replication turned on
 (ie, set the Docker/container \f[C]cmd\f[] to be
 \f[C]run\-mysqld\-master\f[]) the binlog will emit the actual data for
 the rows that change as opposed to the statements (ie, DML like
 insert...) that caused the change.
 .SH AUTHORS
 Red Hat.
--- a/root/usr/bin/cgroup-limits
+++ b/root/usr/bin/cgroup-limits
@ -1,92 +0,0 @@
 #!/usr/bin/python
 """
 Script for parsing cgroup information
 This script will read some limits from the cgroup system and parse
 them, printing out "VARIABLE=VALUE" on each line for every limit that is
 successfully read. Output of this script can be directly fed into
 bash's export command. Recommended usage from a bash script:
    set -o errexit
    export_vars=$(cgroup-limits) ; export $export_vars
 Variables currently supported:
    MAX_MEMORY_LIMIT_IN_BYTES
        Maximum possible limit MEMORY_LIMIT_IN_BYTES can have. This is
        currently constant value of 9223372036854775807.
    MEMORY_LIMIT_IN_BYTES
        Maximum amount of user memory in bytes. If this value is set
        to the same value as MAX_MEMORY_LIMIT_IN_BYTES, it means that
        there is no limit set. The value is taken from
        /sys/fs/cgroup/memory/memory.limit_in_bytes
    NUMBER_OF_CORES
        Number of detected CPU cores that can be used. This value is
        calculated from /sys/fs/cgroup/cpuset/cpuset.cpus
    NO_MEMORY_LIMIT
        Set to "true" if MEMORY_LIMIT_IN_BYTES is so high that the caller
        can act as if no memory limit was set. Undefined otherwise.
 """
 from __future__ import print_function
 import sys
 def _read_file(path):
    try:
        with open(path, 'r') as f:
            return f.read().strip()
    except IOError:
        return None
 def get_memory_limit():
    """
    Read memory limit, in bytes.
    """
    limit = _read_file('/sys/fs/cgroup/memory/memory.limit_in_bytes')
    if limit is None or not limit.isdigit():
        print("Warning: Can't detect memory limit from cgroups",
              file=sys.stderr)
        return None
    return int(limit)
 def get_number_of_cores():
    """
    Read number of CPU cores.
    """
    core_count = 0
    line = _read_file('/sys/fs/cgroup/cpuset/cpuset.cpus')
    if line is None:
        print("Warning: Can't detect number of CPU cores from cgroups",
              file=sys.stderr)
        return None
    for group in line.split(','):
        core_ids = list(map(int, group.split('-')))
        if len(core_ids) == 2:
            core_count += core_ids[1] - core_ids[0] + 1
        else:
            core_count += 1
    return core_count
 if __name__ == "__main__":
    env_vars = {
        "MAX_MEMORY_LIMIT_IN_BYTES": 9223372036854775807,
        "MEMORY_LIMIT_IN_BYTES": get_memory_limit(),
        "NUMBER_OF_CORES": get_number_of_cores()
    }
    env_vars = {k: v for k, v in env_vars.items() if v is not None}
    if env_vars.get("MEMORY_LIMIT_IN_BYTES", 0) >= 92233720368547:
        env_vars["NO_MEMORY_LIMIT"] = "true"
    for key, value in env_vars.items():
        print("{0}={1}".format(key, value))
--- a/root/usr/bin/container-entrypoint
+++ b/root/usr/bin/container-entrypoint
@ -1,2 +0,0 @@
 #!/bin/bash
 exec "$@"
--- a/root/usr/bin/mysqld-master
+++ b/root/usr/bin/mysqld-master
@ -1,50 +0,0 @@
 #!/bin/bash
 #
 # This is an entrypoint that runs the MySQL server in the 'master' mode.
 #
 export_vars=$(cgroup-limits); export $export_vars
 source ${CONTAINER_SCRIPTS_PATH}/common.sh
 set -eu
 export MYSQL_RUNNING_AS_MASTER=1
 [ -f ${CONTAINER_SCRIPTS_PATH}/validate_replication_variables.sh ] && source ${CONTAINER_SCRIPTS_PATH}/validate_replication_variables.sh
 [ -f ${CONTAINER_SCRIPTS_PATH}/validate_variables.sh ] && source ${CONTAINER_SCRIPTS_PATH}/validate_variables.sh
 # The 'server-id' for master needs to be constant
 export MYSQL_SERVER_ID=1
 log_info "The 'master' server-id is ${MYSQL_SERVER_ID}"
 # Process the MySQL configuration files
 log_info 'Processing MySQL configuration files ...'
 envsubst < ${CONTAINER_SCRIPTS_PATH}/my-base.cnf.template > /etc/my.cnf.d/base.cnf
 envsubst < ${CONTAINER_SCRIPTS_PATH}/my-paas.cnf.template > /etc/my.cnf.d/paas.cnf
 envsubst < ${CONTAINER_SCRIPTS_PATH}/my-master.cnf.template > /etc/my.cnf.d/master.cnf
 envsubst < ${CONTAINER_SCRIPTS_PATH}/my-repl-gtid.cnf.template > /etc/my.cnf.d/repl-gtid.cnf
 envsubst < ${CONTAINER_SCRIPTS_PATH}/my-tuning.cnf.template > /etc/my.cnf.d/tuning.cnf
 if [ ! -d "$MYSQL_DATADIR/mysql" ]; then
  initialize_database "$@"
 else
  start_local_mysql "$@"
 fi
 log_info 'Setting passwords ...'
 [ -f ${CONTAINER_SCRIPTS_PATH}/passwd-change.sh ] && source ${CONTAINER_SCRIPTS_PATH}/passwd-change.sh
 # Setup the 'master' replication on the MySQL server
 mysql $mysql_flags <<EOSQL
  GRANT REPLICATION SLAVE ON *.* TO '${MYSQL_MASTER_USER}'@'%' IDENTIFIED BY '${MYSQL_MASTER_PASSWORD}';
  GRANT SELECT ON replication.* TO '${MYSQL_MASTER_USER}'@'%' IDENTIFIED BY '${MYSQL_MASTER_PASSWORD}';
  FLUSH PRIVILEGES;
 EOSQL
 log_info 'Sourcing post-init.sh ...'
 [ -f ${CONTAINER_SCRIPTS_PATH}/post-init.sh ] && source ${CONTAINER_SCRIPTS_PATH}/post-init.sh
 # Restart the MySQL server with public IP bindings
 shutdown_local_mysql
 unset_env_vars
 log_volume_info $MYSQL_DATADIR
 log_info 'Running final exec -- Only MySQL server logs after this point'
 exec ${MYSQL_PREFIX}/libexec/mysqld --defaults-file=$MYSQL_DEFAULTS_FILE "$@" 2>&1
--- a/root/usr/bin/mysqld-slave
+++ b/root/usr/bin/mysqld-slave
@ -1,60 +0,0 @@
 #!/bin/bash
 #
 # This is an entrypoint that runs the MySQL server in the 'slave' mode.
 #
 export_vars=$(cgroup-limits); export $export_vars
 source ${CONTAINER_SCRIPTS_PATH}/common.sh
 set -eu
 # Just run normal server if the data directory is already initialized
 if [ -d "${MYSQL_DATADIR}/mysql" ]; then
  exec /usr/bin/run-mysqld "$@"
 fi
 export MYSQL_RUNNING_AS_SLAVE=1
 [ -f ${CONTAINER_SCRIPTS_PATH}/validate_replication_variables.sh ] && source ${CONTAINER_SCRIPTS_PATH}/validate_replication_variables.sh
 # Generate the unique 'server-id' for this master
 export MYSQL_SERVER_ID=$(server_id)
 log_info "The 'slave' server-id is ${MYSQL_SERVER_ID}"
 # Process the MySQL configuration files
 envsubst < ${CONTAINER_SCRIPTS_PATH}/my-base.cnf.template > /etc/my.cnf.d/base.cnf
 envsubst < ${CONTAINER_SCRIPTS_PATH}/my-paas.cnf.template > /etc/my.cnf.d/paas.cnf
 envsubst < ${CONTAINER_SCRIPTS_PATH}/my-slave.cnf.template > /etc/my.cnf.d/slave.cnf
 envsubst < ${CONTAINER_SCRIPTS_PATH}/my-repl-gtid.cnf.template > /etc/my.cnf.d/repl-gtid.cnf
 envsubst < ${CONTAINER_SCRIPTS_PATH}/my-tuning.cnf.template > /etc/my.cnf.d/tuning.cnf
 # Initialize MySQL database and wait for the MySQL master to accept
 # connections.
 initialize_database "$@"
 wait_for_mysql_master
 # Get binlog file and position from master
 STATUS_INFO=$(mysql --host "$MYSQL_MASTER_SERVICE_NAME" "-u${MYSQL_MASTER_USER}" "-p${MYSQL_MASTER_PASSWORD}" replication -e 'SELECT gtid from replication limit 1\G')
 GTID_VALUE=$(echo "$STATUS_INFO" | grep 'gtid:' | head -n 1 | sed -e 's/^\s*gtid: //')
 # checking STATUS_INFO here because empty GTID_VALUE is valid value
 if [ -z "${STATUS_INFO}" ] ; then
  echo "Could not read GTID value from master"
  exit 1
 fi
 mysql $mysql_flags <<EOSQL
  STOP SLAVE;
  SET GLOBAL gtid_slave_pos = "${GTID_VALUE}";
  CHANGE MASTER TO MASTER_HOST='${MYSQL_MASTER_SERVICE_NAME}',MASTER_USER='${MYSQL_MASTER_USER}', MASTER_PASSWORD='${MYSQL_MASTER_PASSWORD}', MASTER_USE_GTID=slave_pos;
  START SLAVE;
 EOSQL
 log_info 'Sourcing post-init.sh ...'
 [ -f ${CONTAINER_SCRIPTS_PATH}/post-init.sh ] && source ${CONTAINER_SCRIPTS_PATH}/post-init.sh
 # Restart the MySQL server with public IP bindings
 shutdown_local_mysql
 unset_env_vars
 log_volume_info $MYSQL_DATADIR
 log_info 'Running final exec -- Only MySQL server logs after this point'
 exec ${MYSQL_PREFIX}/libexec/mysqld --defaults-file=$MYSQL_DEFAULTS_FILE \
  --report-host=$(hostname -i) "$@" 2>&1
--- a/root/usr/bin/run-mysqld
+++ b/root/usr/bin/run-mysqld
@ -1,35 +0,0 @@
 #!/bin/bash
 export_vars=$(cgroup-limits); export $export_vars
 source ${CONTAINER_SCRIPTS_PATH}/common.sh
 set -eu
 [ -f ${CONTAINER_SCRIPTS_PATH}/validate-variables.sh ] && source ${CONTAINER_SCRIPTS_PATH}/validate-variables.sh
 # Process the MySQL configuration files
 log_info 'Processing MySQL configuration files ...'
 envsubst < ${CONTAINER_SCRIPTS_PATH}/my-base.cnf.template > /etc/my.cnf.d/base.cnf
 envsubst < ${CONTAINER_SCRIPTS_PATH}/my-paas.cnf.template > /etc/my.cnf.d/paas.cnf
 envsubst < ${CONTAINER_SCRIPTS_PATH}/my-tuning.cnf.template > /etc/my.cnf.d/tuning.cnf
 if [ ! -d "$MYSQL_DATADIR/mysql" ]; then
  initialize_database "$@"
 else
  start_local_mysql "$@"
 fi
 if [ -f ${CONTAINER_SCRIPTS_PATH}/passwd-change.sh ]; then
  log_info 'Setting passwords ...'
  source ${CONTAINER_SCRIPTS_PATH}/passwd-change.sh
 fi
 if [ -f ${CONTAINER_SCRIPTS_PATH}/post-init.sh ]; then
  log_info 'Sourcing post-init.sh ...'
  source ${CONTAINER_SCRIPTS_PATH}/post-init.sh
 fi
 # Restart the MySQL server with public IP bindings
 shutdown_local_mysql
 unset_env_vars
 log_volume_info $MYSQL_DATADIR
 log_info 'Running final exec -- Only MySQL server logs after this point'
 exec ${MYSQL_PREFIX}/libexec/mysqld --defaults-file=$MYSQL_DEFAULTS_FILE "$@" 2>&1
--- a/root/usr/bin/run-mysqld-master
+++ b/root/usr/bin/run-mysqld-master
@ -1,50 +0,0 @@
 #!/bin/bash
 #
 # This is an entrypoint that runs the MySQL server in the 'master' mode.
 #
 export_vars=$(cgroup-limits); export $export_vars
 source ${CONTAINER_SCRIPTS_PATH}/common.sh
 set -eu
 export MYSQL_RUNNING_AS_MASTER=1
 [ -f ${CONTAINER_SCRIPTS_PATH}/validate_replication_variables.sh ] && source ${CONTAINER_SCRIPTS_PATH}/validate_replication_variables.sh
 [ -f ${CONTAINER_SCRIPTS_PATH}/validate_variables.sh ] && source ${CONTAINER_SCRIPTS_PATH}/validate_variables.sh
 # The 'server-id' for master needs to be constant
 export MYSQL_SERVER_ID=1
 log_info "The 'master' server-id is ${MYSQL_SERVER_ID}"
 # Process the MySQL configuration files
 log_info 'Processing MySQL configuration files ...'
 envsubst < ${CONTAINER_SCRIPTS_PATH}/my-base.cnf.template > /etc/my.cnf.d/base.cnf
 envsubst < ${CONTAINER_SCRIPTS_PATH}/my-paas.cnf.template > /etc/my.cnf.d/paas.cnf
 envsubst < ${CONTAINER_SCRIPTS_PATH}/my-master.cnf.template > /etc/my.cnf.d/master.cnf
 envsubst < ${CONTAINER_SCRIPTS_PATH}/my-repl-gtid.cnf.template > /etc/my.cnf.d/repl-gtid.cnf
 envsubst < ${CONTAINER_SCRIPTS_PATH}/my-tuning.cnf.template > /etc/my.cnf.d/tuning.cnf
 if [ ! -d "$MYSQL_DATADIR/mysql" ]; then
  initialize_database "$@"
 else
  start_local_mysql "$@"
 fi
 log_info 'Setting passwords ...'
 [ -f ${CONTAINER_SCRIPTS_PATH}/passwd-change.sh ] && source ${CONTAINER_SCRIPTS_PATH}/passwd-change.sh
 # Setup the 'master' replication on the MySQL server
 mysql $mysql_flags <<EOSQL
  GRANT REPLICATION SLAVE ON *.* TO '${MYSQL_MASTER_USER}'@'%' IDENTIFIED BY '${MYSQL_MASTER_PASSWORD}';
  GRANT SELECT ON replication.* TO '${MYSQL_MASTER_USER}'@'%' IDENTIFIED BY '${MYSQL_MASTER_PASSWORD}';
  FLUSH PRIVILEGES;
 EOSQL
 log_info 'Sourcing post-init.sh ...'
 [ -f ${CONTAINER_SCRIPTS_PATH}/post-init.sh ] && source ${CONTAINER_SCRIPTS_PATH}/post-init.sh
 # Restart the MySQL server with public IP bindings
 shutdown_local_mysql
 unset_env_vars
 log_volume_info $MYSQL_DATADIR
 log_info 'Running final exec -- Only MySQL server logs after this point'
 exec ${MYSQL_PREFIX}/libexec/mysqld --defaults-file=$MYSQL_DEFAULTS_FILE "$@" 2>&1
--- a/root/usr/bin/run-mysqld-slave
+++ b/root/usr/bin/run-mysqld-slave
@ -1,60 +0,0 @@
 #!/bin/bash
 #
 # This is an entrypoint that runs the MySQL server in the 'slave' mode.
 #
 export_vars=$(cgroup-limits); export $export_vars
 source ${CONTAINER_SCRIPTS_PATH}/common.sh
 set -eu
 # Just run normal server if the data directory is already initialized
 if [ -d "${MYSQL_DATADIR}/mysql" ]; then
  exec /usr/bin/run-mysqld "$@"
 fi
 export MYSQL_RUNNING_AS_SLAVE=1
 [ -f ${CONTAINER_SCRIPTS_PATH}/validate_replication_variables.sh ] && source ${CONTAINER_SCRIPTS_PATH}/validate_replication_variables.sh
 # Generate the unique 'server-id' for this master
 export MYSQL_SERVER_ID=$(server_id)
 log_info "The 'slave' server-id is ${MYSQL_SERVER_ID}"
 # Process the MySQL configuration files
 envsubst < ${CONTAINER_SCRIPTS_PATH}/my-base.cnf.template > /etc/my.cnf.d/base.cnf
 envsubst < ${CONTAINER_SCRIPTS_PATH}/my-paas.cnf.template > /etc/my.cnf.d/paas.cnf
 envsubst < ${CONTAINER_SCRIPTS_PATH}/my-slave.cnf.template > /etc/my.cnf.d/slave.cnf
 envsubst < ${CONTAINER_SCRIPTS_PATH}/my-repl-gtid.cnf.template > /etc/my.cnf.d/repl-gtid.cnf
 envsubst < ${CONTAINER_SCRIPTS_PATH}/my-tuning.cnf.template > /etc/my.cnf.d/tuning.cnf
 # Initialize MySQL database and wait for the MySQL master to accept
 # connections.
 initialize_database "$@"
 wait_for_mysql_master
 # Get binlog file and position from master
 STATUS_INFO=$(mysql --host "$MYSQL_MASTER_SERVICE_NAME" "-u${MYSQL_MASTER_USER}" "-p${MYSQL_MASTER_PASSWORD}" replication -e 'SELECT gtid from replication limit 1\G')
 GTID_VALUE=$(echo "$STATUS_INFO" | grep 'gtid:' | head -n 1 | sed -e 's/^\s*gtid: //')
 # checking STATUS_INFO here because empty GTID_VALUE is valid value
 if [ -z "${STATUS_INFO}" ] ; then
  echo "Could not read GTID value from master"
  exit 1
 fi
 mysql $mysql_flags <<EOSQL
  STOP SLAVE;
  SET GLOBAL gtid_slave_pos = "${GTID_VALUE}";
  CHANGE MASTER TO MASTER_HOST='${MYSQL_MASTER_SERVICE_NAME}',MASTER_USER='${MYSQL_MASTER_USER}', MASTER_PASSWORD='${MYSQL_MASTER_PASSWORD}', MASTER_USE_GTID=slave_pos;
  START SLAVE;
 EOSQL
 log_info 'Sourcing post-init.sh ...'
 [ -f ${CONTAINER_SCRIPTS_PATH}/post-init.sh ] && source ${CONTAINER_SCRIPTS_PATH}/post-init.sh
 # Restart the MySQL server with public IP bindings
 shutdown_local_mysql
 unset_env_vars
 log_volume_info $MYSQL_DATADIR
 log_info 'Running final exec -- Only MySQL server logs after this point'
 exec ${MYSQL_PREFIX}/libexec/mysqld --defaults-file=$MYSQL_DEFAULTS_FILE \
  --report-host=$(hostname -i) "$@" 2>&1
--- a/root/usr/libexec/container-setup
+++ b/root/usr/libexec/container-setup
@ -1,58 +0,0 @@
 #!/bin/bash
 # This function returns all config files that daemon uses and their path
 # includes /opt. It is used to get correct path to the config file.
 mysql_get_config_files_scl() {
    scl enable ${ENABLED_COLLECTIONS} -- my_print_defaults --help --verbose | \
        grep --after=1 '^Default options' | \
        tail -n 1 | \
        grep -o '[^ ]*opt[^ ]*my.cnf'
 }
 # This function picks the main config file that deamon uses and we ship in rpm
 mysql_get_correct_config() {
    # we use the same config in non-SCL packages, not necessary to guess
    [ -z "${ENABLED_COLLECTIONS}" ] && echo -n "/etc/my.cnf" && return
    # from all config files read by daemon, pick the first that exists
    for f in `mysql_get_config_files_scl` ; do
        [ -f "$f" ] && echo "$f"
    done | head -n 1
 }
 export MYSQL_CONFIG_FILE=$(mysql_get_correct_config)
 [ -z "$MYSQL_CONFIG_FILE" ] && echo "MYSQL_CONFIG_FILE is empty" && exit 1
 unset -f mysql_get_correct_config mysql_get_config_files_scl
 # we provide own config files for the container, so clean what rpm ships here
 mkdir -p ${MYSQL_CONFIG_FILE}.d
 rm -f ${MYSQL_CONFIG_FILE}.d/*
 # we may add options during service init, so we need to have this dir writable by daemon user
 chown -R mysql:0 ${MYSQL_CONFIG_FILE}.d ${MYSQL_CONFIG_FILE}
 restorecon -R ${MYSQL_CONFIG_FILE}.d ${MYSQL_CONFIG_FILE}
 # API of the container are standard paths /etc/my.cnf and /etc/my.cnf.d
 # we already include own /etc/my.cnf for container, but for cases the
 # actually used config file is not on standard path /etc/my.cnf, we
 # need to move it to the location daemon expects it and create symlinks
 if [ "$MYSQL_CONFIG_FILE" != "/etc/my.cnf" ] ; then
    rm -rf /etc/my.cnf.d
    mv /etc/my.cnf ${MYSQL_CONFIG_FILE}
    ln -s ${MYSQL_CONFIG_FILE} /etc/my.cnf
    ln -s ${MYSQL_CONFIG_FILE}.d /etc/my.cnf.d
 fi
 # setup directory for data
 mkdir -p /var/lib/mysql/data
 chown -R mysql:0 /var/lib/mysql
 restorecon -R /var/lib/mysql
 # Loosen permission bits for group to avoid problems running container with
 # arbitrary UID
 # When only specifying user, group is 0, that's why /var/lib/mysql must have
 # owner mysql.0; that allows to avoid a+rwx for this dir
 chmod g+w -R /var/lib/mysql ${MYSQL_CONFIG_FILE}.d
--- a/root/usr/share/container-scripts/mysql/README.md
+++ b/root/usr/share/container-scripts/mysql/README.md
@ -1,135 +0,0 @@
 MariaDB Docker image
 ====================
 This container image includes MariaDB server 10.1 for OpenShift and general usage.
 Users can choose between RHEL and CentOS based images.
 Dockerfile for CentOS is called Dockerfile, Dockerfile for RHEL is called
 Dockerfile.rhel7.
 Environment variables and volumes
 ----------------------------------
 The image recognizes the following environment variables that you can set during
 initialization by passing `-e VAR=VALUE` to the Docker run command.
 |    Variable name       |    Description                            |
 | :--------------------- | ----------------------------------------- |
 |  `MYSQL_USER`          | User name for MySQL account to be created |
 |  `MYSQL_PASSWORD`      | Password for the user account             |
 |  `MYSQL_DATABASE`      | Database name                             |
 |  `MYSQL_ROOT_PASSWORD` | Password for the root user (optional)     |
 The following environment variables influence the MySQL configuration file. They are all optional.
 |    Variable name                |    Description                                                    |    Default
 | :------------------------------ | ----------------------------------------------------------------- | -------------------------------
 |  `MYSQL_LOWER_CASE_TABLE_NAMES` | Sets how the table names are stored and compared                  |  0
 |  `MYSQL_MAX_CONNECTIONS`        | The maximum permitted number of simultaneous client connections   |  151
 |  `MYSQL_MAX_ALLOWED_PACKET`     | The maximum size of one packet or any generated/intermediate string | 200M
 |  `MYSQL_FT_MIN_WORD_LEN`        | The minimum length of the word to be included in a FULLTEXT index |  4
 |  `MYSQL_FT_MAX_WORD_LEN`        | The maximum length of the word to be included in a FULLTEXT index |  20
 |  `MYSQL_AIO`                    | Controls the `innodb_use_native_aio` setting value in case the native AIO is broken. See http://help.directadmin.com/item.php?id=529 |  1
 |  `MYSQL_TABLE_OPEN_CACHE`       | The number of open tables for all threads                         |  400
 |  `MYSQL_KEY_BUFFER_SIZE`        | The size of the buffer used for index blocks                      |  32M (or 10% of available memory)
 |  `MYSQL_SORT_BUFFER_SIZE`       | The size of the buffer used for sorting                           |  256K
 |  `MYSQL_READ_BUFFER_SIZE`       | The size of the buffer used for a sequential scan                 |  8M (or 5% of available memory)
 |  `MYSQL_INNODB_BUFFER_POOL_SIZE`| The size of the buffer pool where InnoDB caches table and index data |  32M (or 50% of available memory)
 |  `MYSQL_INNODB_LOG_FILE_SIZE`   | The size of each log file in a log group                          |  8M (or 15% of available available)
 |  `MYSQL_INNODB_LOG_BUFFER_SIZE` | The size of the buffer that InnoDB uses to write to the log files on disk | 8M (or 15% of available memory)
 |  `MYSQL_DEFAULTS_FILE`          | Point to an alternative configuration file                        |  /etc/my.cnf
 |  `MYSQL_BINLOG_FORMAT`          | Set sets the binlog format, supported values are `row` and `statement` | statement
 You can also set the following mount points by passing the `-v /host:/container` flag to Docker.
 |  Volume mount point      | Description          |
 | :----------------------- | -------------------- |
 |  `/var/lib/mysql/data`   | MySQL data directory |
 **Notice: When mouting a directory from the host into the container, ensure that the mounted
 directory has the appropriate permissions and that the owner and group of the directory
 matches the user UID or name which is running inside the container.**
 Usage
 ---------------------------------
 For this, we will assume that you are using the `rhscl/mariadb-100-rhel7` image.
 If you want to set only the mandatory environment variables and not store
 the database in a host directory, execute the following command:
 ```
 $ docker run -d --name mariadb_database -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 rhscl/mariadb-100-rhel7
 ```
 This will create a container named `mariadb_database` running MySQL with database
 `db` and user with credentials `user:pass`. Port 3306 will be exposed and mapped
 to the host. If you want your database to be persistent across container executions,
 also add a `-v /host/db/path:/var/lib/mysql/data` argument. This will be the MySQL
 data directory.
 If the database directory is not initialized, the entrypoint script will first
 run [`mysql_install_db`](https://dev.mysql.com/doc/refman/5.6/en/mysql-install-db.html)
 and setup necessary database users and passwords. After the database is initialized,
 or if it was already present, `mysqld` is executed and will run as PID 1. You can
 stop the detached container by running `docker stop mariadb_database`.
 MariaDB auto-tuning
 -------------------
 When the MySQL image is run with the `--memory` parameter set and you didn't
 specify value for some parameters, their values will be automatically
 calculated based on the available memory.
 | Variable name                   | Configuration parameter   | Relative value
 | :-------------------------------| ------------------------- | --------------
 | `MYSQL_KEY_BUFFER_SIZE`         | `key_buffer_size`         | 10%
 | `MYSQL_READ_BUFFER_SIZE`        | `read_buffer_size`        | 5%
 | `MYSQL_INNODB_BUFFER_POOL_SIZE` | `innodb_buffer_pool_size` | 50%
 | `MYSQL_INNODB_LOG_FILE_SIZE`    | `innodb_log_file_size`    | 15%
 | `MYSQL_INNODB_LOG_BUFFER_SIZE`  | `innodb_log_buffer_size`  | 15%
 MySQL root user
 ---------------------------------
 The root user has no password set by default, only allowing local connections.
 You can set it by setting the `MYSQL_ROOT_PASSWORD` environment variable. This
 will allow you to login to the root account remotely. Local connections will
 still not require a password.
 To disable remote root access, simply unset `MYSQL_ROOT_PASSWORD` and restart
 the container.
 Changing passwords
 ------------------
 Since passwords are part of the image configuration, the only supported method
 to change passwords for the database user (`MYSQL_USER`) and root user is by
 changing the environment variables `MYSQL_PASSWORD` and `MYSQL_ROOT_PASSWORD`,
 respectively.
 Changing database passwords through SQL statements or any way other than through
 the environment variables aforementioned will cause a mismatch between the
 values stored in the variables and the actual passwords. Whenever a database
 container starts it will reset the passwords to the values stored in the
 environment variables.
 Default my.cnf file
 -------------------
 With environment variables we are able to customize a lot of different parameters
 or configurations for the mysql bootstrap configurations. If you'd prefer to use
 your own configuration file, you can override the `MYSQL_DEFAULTS_FILE` env
 variable with the full path of the file you wish to use. For example, the default
 location is `/etc/my.cnf` but you can change it to `/etc/mysql/my.cnf` by setting
 `MYSQL_DEFAULTS_FILE=/etc/mysql/my.cnf`
 Changing the replication binlog_format
 --------------------------------------
 Some applications may wish to use `row` binlog_formats (for example, those built
  with change-data-capture in mind). The default replication/binlog format is
  `statement` but to change it you can set the `MYSQL_BINLOG_FORMAT` environment
  variable. For example `MYSQL_BINLOG_FORMAT=row`. Now when you run the database
  with `master` replication turned on (ie, set the Docker/container `cmd` to be
 `run-mysqld-master`) the binlog will emit the actual data for the rows that change
 as opposed to the statements (ie, DML like insert...) that caused the change.
--- a/root/usr/share/container-scripts/mysql/common.sh
+++ b/root/usr/share/container-scripts/mysql/common.sh
@ -1,164 +0,0 @@
 #!/bin/bash
 source ${CONTAINER_SCRIPTS_PATH}/helpers.sh
 # Data directory where MySQL database files live. The data subdirectory is here
 # because .bashrc and my.cnf both live in /var/lib/mysql/ and we don't want a
 # volume to override it.
 export MYSQL_DATADIR=/var/lib/mysql/data
 # Configuration settings.
 export MYSQL_DEFAULTS_FILE=${MYSQL_DEFAULTS_FILE:-/etc/my.cnf}
 export MYSQL_BINLOG_FORMAT=${MYSQL_BINLOG_FORMAT:-STATEMENT}
 export MYSQL_LOWER_CASE_TABLE_NAMES=${MYSQL_LOWER_CASE_TABLE_NAMES:-0}
 export MYSQL_MAX_CONNECTIONS=${MYSQL_MAX_CONNECTIONS:-151}
 export MYSQL_FT_MIN_WORD_LEN=${MYSQL_FT_MIN_WORD_LEN:-4}
 export MYSQL_FT_MAX_WORD_LEN=${MYSQL_FT_MAX_WORD_LEN:-20}
 export MYSQL_AIO=${MYSQL_AIO:-1}
 export MYSQL_MAX_ALLOWED_PACKET=${MYSQL_MAX_ALLOWED_PACKET:-200M}
 export MYSQL_TABLE_OPEN_CACHE=${MYSQL_TABLE_OPEN_CACHE:-400}
 export MYSQL_SORT_BUFFER_SIZE=${MYSQL_SORT_BUFFER_SIZE:-256K}
 if [ -n "${NO_MEMORY_LIMIT:-}" -o -z "${MEMORY_LIMIT_IN_BYTES:-}" ]; then
  key_buffer_size='32M'
  read_buffer_size='8M'
  innodb_buffer_pool_size='32M'
  innodb_log_file_size='8M'
  innodb_log_buffer_size='8M'
 else
  key_buffer_size="$(python -c "print(int((${MEMORY_LIMIT_IN_BYTES}/(1024*1024))*0.1))")M"
  read_buffer_size="$(python -c "print(int((${MEMORY_LIMIT_IN_BYTES}/(1024*1024))*0.05))")M"
  innodb_buffer_pool_size="$(python -c "print(int((${MEMORY_LIMIT_IN_BYTES}/(1024*1024))*0.5))")M"
  innodb_log_file_size="$(python -c "print(int((${MEMORY_LIMIT_IN_BYTES}/(1024*1024))*0.15))")M"
  innodb_log_buffer_size="$(python -c "print(int((${MEMORY_LIMIT_IN_BYTES}/(1024*1024))*0.15))")M"
 fi
 export MYSQL_KEY_BUFFER_SIZE=${MYSQL_KEY_BUFFER_SIZE:-$key_buffer_size}
 export MYSQL_READ_BUFFER_SIZE=${MYSQL_READ_BUFFER_SIZE:-$read_buffer_size}
 export MYSQL_INNODB_BUFFER_POOL_SIZE=${MYSQL_INNODB_BUFFER_POOL_SIZE:-$innodb_buffer_pool_size}
 export MYSQL_INNODB_LOG_FILE_SIZE=${MYSQL_INNODB_LOG_FILE_SIZE:-$innodb_log_file_size}
 export MYSQL_INNODB_LOG_BUFFER_SIZE=${MYSQL_INNODB_LOG_BUFFER_SIZE:-$innodb_log_buffer_size}
 # Be paranoid and stricter than we should be.
 # https://dev.mysql.com/doc/refman/en/identifiers.html
 mysql_identifier_regex='^[a-zA-Z0-9_]+$'
 mysql_password_regex='^[a-zA-Z0-9_~!@#$%^&*()-=<>,.?;:|]+$'
 # Variables that are used to connect to local mysql during initialization
 mysql_flags="-u root --socket=/tmp/mysql.sock"
 admin_flags="--defaults-file=$MYSQL_DEFAULTS_FILE $mysql_flags"
 # Make sure env variables don't propagate to mysqld process.
 function unset_env_vars() {
  log_info 'Cleaning up environment variables MYSQL_USER, MYSQL_PASSWORD, MYSQL_DATABASE and MYSQL_ROOT_PASSWORD ...'
  unset MYSQL_USER MYSQL_PASSWORD MYSQL_DATABASE MYSQL_ROOT_PASSWORD
 }
 # Poll until MySQL responds to our ping.
 function wait_for_mysql() {
  pid=$1 ; shift
  while [ true ]; do
    if [ -d "/proc/$pid" ]; then
      mysqladmin --socket=/tmp/mysql.sock ping &>/dev/null && log_info "MySQL started successfully" && return 0
    else
      return 1
    fi
    log_info "Waiting for MySQL to start ..."
    sleep 1
  done
 }
 # Start local MySQL server with a defaults file
 function start_local_mysql() {
  log_info 'Starting MySQL server with disabled networking ...'
  ${MYSQL_PREFIX}/libexec/mysqld \
    --defaults-file=$MYSQL_DEFAULTS_FILE \
    --skip-networking --socket=/tmp/mysql.sock "$@" &
  mysql_pid=$!
  wait_for_mysql $mysql_pid
 }
 # Shutdown mysql flushing privileges
 function shutdown_local_mysql() {
  log_info 'Shutting down MySQL ...'
  mysqladmin $admin_flags flush-privileges shutdown
 }
 # Initialize the MySQL database (create user accounts and the initial database)
 function initialize_database() {
  log_info 'Initializing database ...'
  log_info 'Running mysql_install_db ...'
  # Using --rpm since we need mysql_install_db behaves as in RPM
  # Using empty --basedir to work-around https://bugzilla.redhat.com/show_bug.cgi?id=1406391
  mysql_install_db --rpm --datadir=$MYSQL_DATADIR --basedir=''
  start_local_mysql "$@"
  if [ -v MYSQL_RUNNING_AS_SLAVE ]; then
    log_info 'Initialization finished'
    return 0
  fi
  if [ -v MYSQL_RUNNING_AS_MASTER ]; then
    # Save master status into a separate database.
    STATUS_INFO=$(mysql $admin_flags -e 'SHOW MASTER STATUS\G')
    BINLOG_POSITION=$(echo "$STATUS_INFO" | grep 'Position:' | head -n 1 | sed -e 's/^\s*Position: //')
    BINLOG_FILE=$(echo "$STATUS_INFO" | grep 'File:' | head -n 1 | sed -e 's/^\s*File: //')
    GTID_INFO=$(mysql $admin_flags -e "SELECT BINLOG_GTID_POS('$BINLOG_FILE', '$BINLOG_POSITION') AS gtid_value \G")
    GTID_VALUE=$(echo "$GTID_INFO" | grep 'gtid_value:' | head -n 1 | sed -e 's/^\s*gtid_value: //')
    mysqladmin $admin_flags create replication
    mysql $admin_flags <<EOSQL
    use replication
    CREATE TABLE replication (gtid VARCHAR(256));
    INSERT INTO replication (gtid) VALUES ('$GTID_VALUE');
 EOSQL
  fi
  # Do not care what option is compulsory here, just create what is specified
  if [ -v MYSQL_USER ]; then
    log_info "Creating user specified by MYSQL_USER (${MYSQL_USER}) ..."
 mysql $mysql_flags <<EOSQL
    CREATE USER '${MYSQL_USER}'@'%' IDENTIFIED BY '${MYSQL_PASSWORD}';
 EOSQL
  fi
  if [ -v MYSQL_DATABASE ]; then
    log_info "Creating database ${MYSQL_DATABASE} ..."
    mysqladmin $admin_flags create "${MYSQL_DATABASE}"
    if [ -v MYSQL_USER ]; then
      log_info "Granting privileges to user ${MYSQL_USER} for ${MYSQL_DATABASE} ..."
 mysql $mysql_flags <<EOSQL
      GRANT ALL ON \`${MYSQL_DATABASE}\`.* TO '${MYSQL_USER}'@'%' ;
      FLUSH PRIVILEGES ;
 EOSQL
    fi
  fi
  if [ -v MYSQL_ROOT_PASSWORD ]; then
    log_info "Setting password for MySQL root user ..."
 mysql $mysql_flags <<EOSQL
    CREATE USER IF NOT EXISTS 'root'@'%';
    GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}' WITH GRANT OPTION;
 EOSQL
  fi
  log_info 'Initialization finished'
 }
 # The 'server_id' number for slave needs to be within 1-4294967295 range.
 # This function will take the 'hostname' if the container, hash it and turn it
 # into the number.
 # See: https://dev.mysql.com/doc/refman/en/replication-options.html#option_mysqld_server-id
 function server_id() {
  checksum=$(sha256sum <<< $(hostname -i))
  checksum=${checksum:0:14}
  echo -n $((0x${checksum}%4294967295))
 }
 function wait_for_mysql_master() {
  while true; do
    log_info "Waiting for MySQL master (${MYSQL_MASTER_SERVICE_NAME}) to accept connections ..."
    mysqladmin --host=${MYSQL_MASTER_SERVICE_NAME} --user="${MYSQL_MASTER_USER}" \
      --password="${MYSQL_MASTER_PASSWORD}" ping &>/dev/null && log_info "MySQL master is ready" && return 0
    sleep 1
  done
 }
--- a/root/usr/share/container-scripts/mysql/helpers.sh
+++ b/root/usr/share/container-scripts/mysql/helpers.sh
@ -1,24 +0,0 @@
 function log_info {
  echo "---> `date +%T`     $@"
 }
 function log_and_run {
  log_info "Running $@"
  "$@"
 }
 function log_volume_info {
  CONTAINER_DEBUG=${CONTAINER_DEBUG:-}
  if [[ "${CONTAINER_DEBUG,,}" != "true" ]]; then
    return
  fi
  log_info "Volume info for $@:"
  set +e
  log_and_run mount
  while [ $# -gt 0 ]; do
    log_and_run ls -alZ $1
    shift
  done
  set -e
 }
--- a/root/usr/share/container-scripts/mysql/my-base.cnf.template
+++ b/root/usr/share/container-scripts/mysql/my-base.cnf.template
@ -1,5 +0,0 @@
 [mysqld]
 datadir = ${MYSQL_DATADIR}
 basedir = ${MYSQL_PREFIX}
 plugin-dir = ${MYSQL_PREFIX}/lib64/mysql/plugin
--- a/root/usr/share/container-scripts/mysql/my-master.cnf.template
+++ b/root/usr/share/container-scripts/mysql/my-master.cnf.template
@ -1,7 +0,0 @@
 [mysqld]
 server-id     = ${MYSQL_SERVER_ID}
 log_bin       = ${MYSQL_DATADIR}/mysql-bin.log
 binlog_do_db  = mysql
 binlog_do_db  = ${MYSQL_DATABASE}
 binlog_format = ${MYSQL_BINLOG_FORMAT}
--- a/root/usr/share/container-scripts/mysql/my-paas.cnf.template
+++ b/root/usr/share/container-scripts/mysql/my-paas.cnf.template
@ -1,26 +0,0 @@
 [mysqld]
 #
 # Settings configured by the user
 #
 # Sets how the table names are stored and compared. Default: 0
 lower_case_table_names = ${MYSQL_LOWER_CASE_TABLE_NAMES}
 # The maximum permitted number of simultaneous client connections. Default: 151
 max_connections = ${MYSQL_MAX_CONNECTIONS}
 # The minimum/maximum lengths of the word to be included in a FULLTEXT index. Default: 4/20
 ft_min_word_len = ${MYSQL_FT_MIN_WORD_LEN}
 ft_max_word_len = ${MYSQL_FT_MAX_WORD_LEN}
 # In case the native AIO is broken. Default: 1
 # See http://help.directadmin.com/item.php?id=529
 innodb_use_native_aio = ${MYSQL_AIO}
 [myisamchk]
 # The minimum/maximum lengths of the word to be included in a FULLTEXT index. Default: 4/20
 #
 # To ensure that myisamchk and the server use the same values for full-text
 # parameters, we placed them in both sections.
 ft_min_word_len = ${MYSQL_FT_MIN_WORD_LEN}
 ft_max_word_len = ${MYSQL_FT_MAX_WORD_LEN}
--- a/root/usr/share/container-scripts/mysql/my-repl-gtid.cnf.template
+++ b/root/usr/share/container-scripts/mysql/my-repl-gtid.cnf.template
@ -1,4 +0,0 @@
 [mysqld]
 log-slave-updates = ON
--- a/root/usr/share/container-scripts/mysql/my-slave.cnf.template
+++ b/root/usr/share/container-scripts/mysql/my-slave.cnf.template
@ -1,7 +0,0 @@
 [mysqld]
 server-id     = ${MYSQL_SERVER_ID}
 log_bin       = ${MYSQL_DATADIR}/mysql-bin.log
 relay-log     = ${MYSQL_DATADIR}/mysql-relay-bin.log
 binlog_do_db  = mysql
 binlog_do_db  = ${MYSQL_DATABASE}
--- a/root/usr/share/container-scripts/mysql/my-tuning.cnf.template
+++ b/root/usr/share/container-scripts/mysql/my-tuning.cnf.template
@ -1,28 +0,0 @@
 [mysqld]
 key_buffer_size = ${MYSQL_KEY_BUFFER_SIZE}
 max_allowed_packet = ${MYSQL_MAX_ALLOWED_PACKET}
 table_open_cache = ${MYSQL_TABLE_OPEN_CACHE}
 sort_buffer_size = ${MYSQL_SORT_BUFFER_SIZE}
 read_buffer_size = ${MYSQL_READ_BUFFER_SIZE}
 read_rnd_buffer_size = 256K
 net_buffer_length = 2K
 thread_stack = 256K
 myisam_sort_buffer_size = 2M
 # It is recommended that innodb_buffer_pool_size is configured to 50 to 75 percent of system memory.
 innodb_buffer_pool_size = ${MYSQL_INNODB_BUFFER_POOL_SIZE}
 innodb_additional_mem_pool_size = 2M
 # Set .._log_file_size to 25 % of buffer pool size
 innodb_log_file_size = ${MYSQL_INNODB_LOG_FILE_SIZE}
 innodb_log_buffer_size = ${MYSQL_INNODB_LOG_BUFFER_SIZE}
 [mysqldump]
 quick
 max_allowed_packet = 16M
 [mysql]
 no-auto-rehash
 [myisamchk]
 key_buffer_size = 8M
 sort_buffer_size = 8M
--- a/root/usr/share/container-scripts/mysql/passwd-change.sh
+++ b/root/usr/share/container-scripts/mysql/passwd-change.sh
@ -1,23 +0,0 @@
 # Set the password for MySQL user and root everytime this container is started.
 # This allows to change the password by editing the deployment configuration.
 if [[ -v MYSQL_USER && -v MYSQL_PASSWORD ]]; then
  mysql $mysql_flags <<EOSQL
    SET PASSWORD FOR '${MYSQL_USER}'@'%' = PASSWORD('${MYSQL_PASSWORD}');
 EOSQL
 fi
 # The MYSQL_ROOT_PASSWORD is optional, therefore we need to either enable remote
 # access with a password if the variable is set or disable remote access otherwise.
 if [ -v MYSQL_ROOT_PASSWORD ]; then
  # create a user if it doesn't exist and set its password
  mysql $mysql_flags <<EOSQL
    CREATE USER IF NOT EXISTS 'root'@'%';
    GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}' WITH GRANT OPTION;
 EOSQL
 else
  mysql $mysql_flags <<EOSQL
    DROP USER IF EXISTS 'root'@'%';
    FLUSH PRIVILEGES;
 EOSQL
 fi
--- a/root/usr/share/container-scripts/mysql/post-init.sh
+++ b/root/usr/share/container-scripts/mysql/post-init.sh
--- a/root/usr/share/container-scripts/mysql/validate-replication-variables.sh
+++ b/root/usr/share/container-scripts/mysql/validate-replication-variables.sh
@ -1,18 +0,0 @@
 function validate_replication_variables() {
  if ! [[ -v MYSQL_DATABASE && -v MYSQL_MASTER_USER && -v MYSQL_MASTER_PASSWORD && \
        ( "${MYSQL_RUNNING_AS_SLAVE:-0}" != "1" || -v MYSQL_MASTER_SERVICE_NAME ) ]]; then
    echo
    echo "For master/slave replication, you have to specify following environment variables:"
    echo "  MYSQL_MASTER_SERVICE_NAME (slave only)"
    echo "  MYSQL_DATABASE"
    echo "  MYSQL_MASTER_USER"
    echo "  MYSQL_MASTER_PASSWORD"
    echo
  fi
  [[ "$MYSQL_DATABASE" =~ $mysql_identifier_regex ]] || usage "Invalid database name"
  [[ "$MYSQL_MASTER_USER"     =~ $mysql_identifier_regex ]] || usage "Invalid MySQL master username"
  [ ${#MYSQL_MASTER_USER} -le 16 ] || usage "MySQL master username too long (maximum 16 characters)"
  [[ "$MYSQL_MASTER_PASSWORD" =~ $mysql_password_regex   ]] || usage "Invalid MySQL master password"
 }
 validate_replication_variables
--- a/root/usr/share/container-scripts/mysql/validate-variables.sh
+++ b/root/usr/share/container-scripts/mysql/validate-variables.sh
@ -1,78 +0,0 @@
 function usage() {
  [ $# == 1 ] && echo "error: $1"
  echo "You must either specify the following environment variables:"
  echo "  MYSQL_USER (regex: '$mysql_identifier_regex')"
  echo "  MYSQL_PASSWORD (regex: '$mysql_password_regex')"
  echo "  MYSQL_DATABASE (regex: '$mysql_identifier_regex')"
  echo "Or the following environment variable:"
  echo "  MYSQL_ROOT_PASSWORD (regex: '$mysql_password_regex')"
  echo "Or both."
  echo "Optional Settings:"
  echo "  MYSQL_LOWER_CASE_TABLE_NAMES (default: 0)"
  echo "  MYSQL_MAX_CONNECTIONS (default: 151)"
  echo "  MYSQL_FT_MIN_WORD_LEN (default: 4)"
  echo "  MYSQL_FT_MAX_WORD_LEN (default: 20)"
  echo "  MYSQL_AIO (default: 1)"
  echo "  MYSQL_KEY_BUFFER_SIZE (default: 32M or 10% of available memory)"
  echo "  MYSQL_MAX_ALLOWED_PACKET (default: 200M)"
  echo "  MYSQL_TABLE_OPEN_CACHE (default: 400)"
  echo "  MYSQL_SORT_BUFFER_SIZE (default: 256K)"
  echo "  MYSQL_READ_BUFFER_SIZE (default: 8M or 5% of available memory)"
  echo "  MYSQL_INNODB_BUFFER_POOL_SIZE (default: 32M or 50% of available memory)"
  echo "  MYSQL_INNODB_LOG_FILE_SIZE (default: 8M or 15% of available memory)"
  echo "  MYSQL_INNODB_LOG_BUFFER_SIZE (default: 8M or 15% of available memory)"
  echo
  echo "For more information, see https://github.com/sclorg/mariadb-container"
  exit 1
 }
 function validate_variables() {
  # Check basic sanity of specified variables
  if [[ -v MYSQL_USER && -v MYSQL_PASSWORD ]]; then
    [[ "$MYSQL_USER"     =~ $mysql_identifier_regex ]] || usage "Invalid MySQL username"
    [ ${#MYSQL_USER} -le 16 ] || usage "MySQL username too long (maximum 16 characters)"
    [[ "$MYSQL_PASSWORD" =~ $mysql_password_regex   ]] || usage "Invalid password"
    user_specified=1
  fi
  if [ -v MYSQL_ROOT_PASSWORD ]; then
    [[ "$MYSQL_ROOT_PASSWORD" =~ $mysql_password_regex ]] || usage "Invalid root password"
    root_specified=1
  fi
  # If MYSQL_USER == "root", we have a special case
  if [[ "${user_specified:-0}" == "1" && "$MYSQL_USER" == "root" ]]; then
    if [[ "${root_specified:-0}" == "1" ]]; then
      usage "When setting MYSQL_USER to 'root' you can only set either MYSQL_PASSWORD or MYSQL_ROOT_PASSWORD"
    fi
    # We will now behave as if MYSQL_USER was not specified
    export MYSQL_ROOT_PASSWORD="$MYSQL_PASSWORD"
    export -n MYSQL_USER
    export -n MYSQL_PASSWORD
    user_specified=0
    root_specified=1
  fi
  # Either combination of user/pass/db or root password is ok
  if [[ "${user_specified:-0}" == "0" && "${root_specified:-0}" == "0" ]]; then
    usage
  fi
  # If the root user is not specified, database name is required
  if [[ "${root_specified:-0}" == "0" ]]; then
    [ -v MYSQL_DATABASE ] || usage "You need to specify database name or root password"
  fi
  if [ -v MYSQL_DATABASE ]; then
    [[ "$MYSQL_DATABASE" =~ $mysql_identifier_regex ]] || usage "Invalid database name"
    [ ${#MYSQL_DATABASE} -le 64 ] || usage "Database name too long (maximum 64 characters)"
  fi
  # Specifically check of incomplete specification
  if [[ -v MYSQL_USER || -v MYSQL_PASSWORD || -v MYSQL_DATABASE ]] && \
     [[ "${user_specified:-0}" == "0" ]]; then
    usage
  fi
 }
 validate_variables
--- a/tests/Makefile
+++ b/tests/Makefile
@ -1,6 +0,0 @@
 MODULE_LINT=/usr/share/moduleframework/tools/modulelint.py
 CMD=python -m avocado run --filter-by-tags=-WIP $(MODULE_LINT) *.py
 #
 all:
 	$(CMD)
--- a/tests/config.yaml
+++ b/tests/config.yaml
@ -1,27 +0,0 @@
 document: modularity-testing
 version: 1
 name: docker.io/modularitycontainers/mariadb
 modulemd-url: http://pkgs.fedoraproject.org/cgit/modules/mariadb.git/plain/mariadb.yaml?h=f26
 service:
    port: 3036
 module:
    docker:
        start: "docker run -it --name mariadb_database -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306"
        container: docker.io/modularitycontainers/mariadb
        labels:
          summary: "MariaDB is a multi-user, multi-threaded SQL database server"
          version: "0"
          architecture: "x86_64"
          description: "MariaDB is a multi-user, multi-threaded SQL database server."
          vendor: "Fedora Project"
          com.redhat.component: "mariadb"
          usage: "docker run -e MYSQL_USER=<user_name> -e MYSQL_PASSWORD=<password> -e MYSQL_DATABASE=<db_name> -e MYSQL_ROOT_PASSWORD=<root_password> -p 3306:3306 mariadb"
          org.fedoraproject.component: "mariadb"
          authoritative-source-url: "registry.fedoraproject.org"
          io.k8s.description: "MariaDB is a multi-user, multi-threaded SQL database server"
          io.k8s.display-name: "MariaDB 10.1"
          io.openshift.expose-services: "3306:mysql"
          io.openshift.tags: "database,mysql,mariadb,mariadb101,galera"
    rpm:
        repo:
            - http://mirror.vutbr.cz/fedora/releases/26/Everything/x86_64/os/
--- a/tests/sanity.py
+++ b/tests/sanity.py
@ -1,61 +0,0 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 #
 # This Modularity Testing Framework helps you to write tests for modules
 # Copyright (C) 2017 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # he Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License along
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Authors: Rado Pitonak <rpitonak@redhat.com>
 #
 from avocado import main
 from avocado.core import exceptions
 from moduleframework import module_framework
 class SanityCheck(module_framework.AvocadoTest):
    """
    :avocado: enable
    """
    def test1(self):
        """
        Simple sanity test
        """
        self.start()
        self.run("ls / | grep bin")
    def test2MariaDBVersion(self):
        """
        Check if MariaDB is installed in correct version
        """
        mariadb_version = "10.1"
        self.start()
        self.run("mysql -V | grep " + mariadb_version)
    def test3ServiceRunning(self):
        """
        Check if MariaDB is running
        """
        self.start()
        self.run('ls  /proc/*/exe -alh | grep mysqld')
 if __name__ == '__main__':
    main()
--- a/tests/sqlqueries.py
+++ b/tests/sqlqueries.py
@ -1,112 +0,0 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 #
 # This Modularity Testing Framework helps you to write tests for modules
 # Copyright (C) 2017 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # he Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License along
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Authors: Rado Pitonak <rpitonak@redhat.com>
 #
 from avocado import main
 from avocado.core import exceptions
 from moduleframework import module_framework
 import time
 class SqlQueriesCheck(module_framework.AvocadoTest):
    """
    :avocado: enable
    """
    # prefix for mysql queries from command line
    MYSQL_CMD = 'mysql --host={} -u"$MYSQL_USER" -p"$MYSQL_PASSWORD" "$MYSQL_DATABASE" -e"{}"'
    def testConnectToDB(self):
        """
        Test connection to database
        """
        sql_query = "SELECT 1;"
        self.start()
        # wait for mariadb to start
        time.sleep(15)
        container_ip = self.runHost("docker inspect -f '{{{{range .NetworkSettings.Networks}}}}{{{{.IPAddress}}}}{{{{end}}}}' mariadb_database").stdout
        print "CONTAINER IP ASA:" + container_ip
        # remove end of line character
        container_ip = container_ip[:-1]
        self.run(self.MYSQL_CMD.format(container_ip, sql_query))
    def testCreateTable(self):
        """
        Creation of table in database
        """
        sql_query = "CREATE TABLE my_table(ID INT PRIMARY KEY NOT NULL);"
        self.start()
        # wait for mariadb to start
        time.sleep(15)
        container_ip = self.runHost("docker inspect -f '{{{{range .NetworkSettings.Networks}}}}{{{{.IPAddress}}}}{{{{end}}}}' mariadb_database").stdout
        # remove end of line character
        container_ip = container_ip[:-1]
        self.run(self.MYSQL_CMD.format(container_ip, sql_query))
    def testComplexDB(self):
        """
        Test different requests towards database (create table, insert,select, drop table)
        """
        # sql queries used for this test case
        sql_queries = {'create_table': 'CREATE TABLE my_table(ID INT PRIMARY KEY NOT NULL, NAME VARCHAR(255));',
                       'insert_data': 'INSERT INTO my_table values({}, \'{}\');',
                       'select': 'SELECT name FROM my_table;',
                       'drop': 'DROP TABLE my_table'}
        self.start()
        # wait for mariadb to start
        time.sleep(15)
        container_ip = self.runHost(
            "docker inspect -f '{{{{range .NetworkSettings.Networks}}}}{{{{.IPAddress}}}}{{{{end}}}}' mariadb_database").stdout
        # remove end of line character
        container_ip = container_ip[:-1]
        # creation of table
        self.run(self.MYSQL_CMD.format(container_ip, sql_queries['create_table']))
        # insert data
        self.run(self.MYSQL_CMD.format(container_ip, sql_queries['insert_data'].format(1, 'name1')))
        self.run(self.MYSQL_CMD.format(container_ip, sql_queries['insert_data'].format(2, 'name2')))
        # select query for validating output
        self.run('{} | grep -E "name1|name2"'.format(self.MYSQL_CMD.format(container_ip, sql_queries['select'])))
        # delete table
        self.run(self.MYSQL_CMD.format(container_ip, sql_queries['drop']))
 if __name__ == '__main__':
    main()
Author	SHA1	Message	Date
Michal Schorm	9a82395125	Rebase to MariaDB 10.4.25 and Galera 26.4.11 Constraining the stream to a Fedora 35, beacuse F<35 reached EOL, and F>35 requires OpenSSL 3	2022-07-17 11:28:35 +02:00
Michal Schorm	9f428baeff	Rebase to MariaDB 10.4.20	2021-07-02 02:10:42 +02:00
Michal Schorm	e614eedb64	Rebuild for rebase of the MariaDB to 10.4.19	2021-05-11 04:52:15 +02:00
Michal Schorm	6408ad1d70	Rebuild with updated Galera sources	2021-03-05 11:23:10 +01:00
Michal Schorm	f2a7688e2f	Rebase to 10.4.18	2021-02-25 03:19:16 +01:00
Michal Schorm	0906ffc527	Rebuild	2020-11-12 13:33:46 +01:00
Michal Schorm	f27e68b5a1	Rebase to 10.4.17 (2nd attemp)	2020-11-12 01:38:00 +01:00
Michal Schorm	d90970a480	Rebase to 10.4.17	2020-11-11 23:48:56 +01:00
Michal Schorm	4fdfe5a461	Disable building for targets other than fedora	2020-11-06 04:04:59 +01:00
Michal Schorm	a64d1e3eb6	Rebuild for MariaDB 10.4.16 and Galera 26.4.6	2020-11-05 05:42:33 +01:00
Michal Schorm	36b83a1ed0	Second attemp to rebuild for MariaDB 10.4.14 and Galera 26.4.5	2020-09-29 11:59:29 +02:00
Michal Schorm	3890fb9dbb	Rebuild for MariaDB 10.4.14	2020-08-21 10:31:30 +02:00
Fedora Release Engineering	eee5fb923a	Branching f33 from rawhide Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2020-08-19 13:49:21 +00:00
Fedora Release Engineering	7814607c5b	- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2020-08-11 21:30:01 +00:00
Fedora Release Engineering	92b2d6eaf4	- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2020-08-08 00:01:57 +00:00
Michal Schorm	b340aa9f04	Rebuild for MariaDB 10.4.13 & Galera 26.4.4	2020-06-08 12:00:01 +02:00
Michal Schorm	92e41c12d3	Update sources for the last rebuild	2020-03-16 15:18:21 +01:00
Michal Schorm	12428233bc	Rebase mariadb-connector-c git submodule to commit fbf1db6 For fix: https://jira.mariadb.org/browse/CONC-441	2020-03-16 15:03:38 +01:00
Michal Schorm	eabf6d2943	Stop building for EPEL-8	2020-02-15 11:57:09 +01:00
Fedora Release Engineering	7702c37614	Branching f32 from rawhide Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2020-02-13 14:24:41 +00:00
Michal Schorm	8920542418	Update to MariaDB 10.4.12	2020-02-10 11:16:13 +01:00
Fedora Release Engineering	5759f8576d	- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2020-02-06 18:24:04 +00:00
Michal Schorm	07ed74bac7	Rebase to 10.4.11	2020-01-10 12:20:57 +01:00
Michal Schorm	1ab904e32e	Rebase to 10.4.10	2019-12-09 14:44:26 +01:00
Michal Schorm	ed1301421e	Rebuild after the client_ed25519.so plugin move to the mariadb-connector-c	2019-09-25 14:45:24 +02:00
Michal Schorm	faf216dcc3	Update for MariaDB 10.4.7	2019-08-23 13:14:16 +02:00
Fedora Release Engineering	b8c4d5b175	Branching f31 from rawhide Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2019-08-13 19:56:52 +00:00
Fedora Release Engineering	0b96ffa880	- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2019-08-12 15:01:07 +00:00
Michal Schorm	174fc8c3a2	update	2019-06-21 14:52:24 +02:00
Michal Schorm	ab661a1226	Update for MariaDB 10.4.6	2019-06-20 18:15:30 +02:00
Michal Schorm	253aec1ecd	Add Galera 26.4 required by MariaDB 10.4	2019-03-13 10:17:59 +01:00
Fedora Release Engineering	b1a86ef04d	Branching f30 from rawhide, second attempt after platform:f31 enablement Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2019-03-04 18:08:35 +00:00
Fedora Release Engineering	3fcb31f319	Branching f30 from rawhide Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2019-03-01 19:15:58 +00:00
Michal Schorm	e0fb5fae73	Profiles update	2019-02-19 17:17:08 +01:00
Michal Schorm	dcbeca14c4	Fix of profiles	2019-01-06 16:37:00 +01:00
Michal Schorm	d965e2556c	Fix of profiles	2019-01-06 16:35:10 +01:00
Michal Schorm	986fdf0bb6	Update for 10.4.1	2019-01-06 16:33:35 +01:00
Michal Schorm	7c2437c97b	Initial version of the modulemd file	2018-11-20 15:07:29 +01:00