diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..b393ea7 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,121 @@ +# docker-dotclear:x.x-anf +# docker-dotclear Dockerfile + +## +# Alpine +## + +# Use latest Alpine docker release +FROM alpine:latest + +# Set system timezone +RUN echo "UTC" > /etc/timezone + +## +# Nginx +## + +# Create user +RUN adduser -D -g 'www' www + +# Install required package +RUN apk add --no-cache --update \ + nginx \ + curl \ + tar \ + unzip \ + xq + +# Create directories structure +RUN mkdir -p /var/www/dotclear +RUN chown -R www:www /var/lib/nginx /var/www + +# Copy nginx configuration +COPY etc/nginx.conf /etc/nginx/nginx.conf +COPY etc/snippets_blogs.conf /etc/nginx/snippets/snippets_blogs.conf +COPY etc/snippets_common.conf /etc/nginx/snippets/snippets_common.conf + +## +# PHP +## + +# Use PHP 8.3 release +ENV VER_PHP=php83 + +# Install PHP required packages +RUN apk add --no-cache --update \ + ${VER_PHP}-common \ + ${VER_PHP}-cli \ + ${VER_PHP}-fpm \ + ${VER_PHP}-session \ + ${VER_PHP}-curl \ + ${VER_PHP}-gd \ + ${VER_PHP}-gmp \ + ${VER_PHP}-exif \ + ${VER_PHP}-tidy \ + ${VER_PHP}-intl \ + ${VER_PHP}-json \ + ${VER_PHP}-mbstring \ + ${VER_PHP}-iconv \ + ${VER_PHP}-gettext \ + ${VER_PHP}-mysqli \ + ${VER_PHP}-opcache \ + ${VER_PHP}-dom \ + ${VER_PHP}-xml \ + ${VER_PHP}-simplexml \ + ${VER_PHP}-zip \ + ${VER_PHP}-sqlite3 + +# Copy PHP configuration +COPY etc/php.ini /etc/${VER_PHP}/php.ini +COPY etc/php-fpm.conf /etc/${VER_PHP}/php-fpm.d/www.conf + +## +# Dotclear +## + +# Select Dotclear release canal (stable | unstable) +ARG CANAL stable +ENV CNL_DOTCLEAR=$CANAL + +# Download latest Dotclear version +RUN curl -fsSL -o versions.xml "http://download.dotclear.org/versions.xml" \ + && curl -fsSL -o dotclear.zip $(cat versions.xml | xq -x "//release[@name='$CNL_DOTCLEAR']/@href") \ + && echo "$(cat versions.xml | xq -x "//release[@name='$CNL_DOTCLEAR']/@checksum") dotclear.zip" | md5sum -c - \ + && mkdir -p /usr/src/dotclear \ + && unzip -d /usr/src dotclear.zip \ + && rm dotclear.zip \ + && chown -R www:www /usr/src/dotclear \ + && chmod -R 755 /usr/src/dotclear/public /usr/src/dotclear/cache \ + && rm -f /var/www/dotclear/app/* + +# Create www structure +COPY www /var/lib/dotclear +RUN chown -R www:www /var/lib/dotclear + +# These variables are only used for first install, see inc/config.php, from dotclear 2.32 +# Custom path for dotclear config file +ENV DC_RC_PATH=/var/www/dotclear/config.php +# Directory of third party plugins +ENV DC_PLUGINS_ROOT=/var/www/dotclear/plugins +# Directory for template cache files +ENV DC_TPL_CACHE=/var/www/dotclear/cache +# Directory for dotclear var +ENV DC_VAR=/var/www/dotclear/var + +## +# END +## + +# Docker container uses port 80 +EXPOSE 80 + +# Set working diretory for container starting script +WORKDIR /var/www/dotclear/app + +# Add container starting script +ADD docker-entrypoint.sh /entrypoint.sh +ENTRYPOINT ["/bin/sh", "/entrypoint.sh"] + +# Docker container healthcheck +HEALTHCHECK --timeout=10s CMD curl --silent --fail http://127.0.0.1:80/fpm-ping || exit 1 \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..67f7d05 --- /dev/null +++ b/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are 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. + + 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. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + 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 Affero 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. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + 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 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 work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero 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 Affero 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 Affero 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 Affero 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. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero 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 Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + 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 AGPL, see +. \ No newline at end of file diff --git a/README.md b/README.md index fd7b682..f46e480 100644 --- a/README.md +++ b/README.md @@ -18,32 +18,35 @@ It is hightly based on work from [darknao](https://github.com/darknao/docker-dot * Dotclear docker images are avaialable at [Docker hub](https://hub.docker.com/r/jcpd/docker-dotclear) * Dotclear docker sources are avaialable at [Github repository](https://github.com/JcDenis/docker-dotclear) -__Important notes:__ -As of today, current images structure change on every release, -do not use these images in production environment. -One of possible breaking change in futur could be the support of multi-blogs -with changed in docker volumes and system path. - ### TAGS -dotclear_version-server_type +Docker image tag is based on __Alpine Linux OS, Nginx server and PHP-FPM language__ +It is composed of Dotclear version or release type. -* jcpd/docker-dotclear:latest is base on stable Alpine / Nginx / PHP-FPM -* jcpd/docker-dotclear:x.xx-dnf is based on stable Debian / Nginx / PHP-FPM -* jcpd/docker-dotclear:x.xx-anf is based on stable Alpine / Nginx / PHP-FPM -* ... (next to come) +* x.x : A given Dotclear version (ex: 2.31.1) +* latest : The latest stable Dotclear release +* dev : A Dotclear unstable (nightly) release + +To build image from stable canal, from the Dokerfile path, execute : + + docker build -t dotclear:latest --build-arg CANAL=stable . + +Or to build image from unstable canal, from the Dokerfile path, execute : + + docker build -t dotclear:dev --build-arg CANAL=unstable . + +Builds should support postgresql and mysql database. ### DOCKER Exemple of a docker compose file with a mariadb database. services: - # MYSQL database service dc_db: image: mariadb:latest container_name: dotcleardb - restart: always + restart: unless-stopped command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW volumes: - dc_db:/var/lib/mysql @@ -57,15 +60,15 @@ Exemple of a docker compose file with a mariadb database. dc_app: image: jcpd/docker-dotclear:latest container_name: dotclearphp + restart: unless-stopped volumes: - - dc_app:/var/www/html - - dc_plugins:/var/www/html/other_plugins + - dc_app:/var/www/dotclear ports: - - 8080:80 + - 80:80 depends_on: - dc_db # MYSQL database service environment: - # These variables are only used for first install, see inc/config.php, from dotclear 2.32 + # These variables are only used for first install, see inc/config.php DC_DBDRIVER: mysqlimb4 # MYSQL full UTF-8 DC_DBHOST: dc_db # MYSQL database service DC_DBNAME: dotclear_db # MYSQL_DATABASE @@ -73,51 +76,77 @@ Exemple of a docker compose file with a mariadb database. DC_DBPASSWORD: dotclear_pwd # MYSQL_PASSWORD DC_DBPREFIX: dc_ # Database tables prefix DC_ADMINMAILFROM: contact@exemple.com # Dotclear mail from - # Optionnal path for third party plugins, must be in /var/www/html - DC_PLUGINS_ROOT: /var/www/html/other_plugins volumes: - dc_app: # NGINX volume - dc_plugins: # plugins volume - dc_db: # MYSQL volume + dc_app: # NGINX (dotclear) volume + dc_db: # MYSQL (database) volume -* You __must__ replace database USER and PASSWORD by something else. + * You __MUST__ replace database USER and PASSWORD by something else. Then execute docker-compose up -d -Dotclear is now available on your server host at http://locahost:8080/ - -Before Dotclear 2.32, on first run, Dotclear does installation process, you must provide values of : -* MySQl database container service name as database host (here dc_db) -* MYSQL_DATABASE as database name -* MYSQL_USER as database login -* MYSQL_PASSWORD as database password - -Builds should support postgresql and mysql database. - -On first run you should wait that container download ans install required version of Dotclear... +Dotclear is now available on your server host at http://locahost/ +On first run Dotclear does its installation process and ask you to create a first user. +On first run you should wait that container download and install required version of Dotclear, +this may takes a while... ### BLOG -These images support Dotclear URL rewriting in PATH INFO mode. -To configure default blog, go to the administration interface at http://localhost/admin, +__Standard configuration__ + +These images use Dotclear URL rewriting in PATH INFO mode. +By default URL and path should be corrected by a custom plugin automatically. +Blogs URLs looks like: + * http://localhost/default/ + * http://localhost/blog2/ + * ... +Blogs administration is available at http://localhost/admin + +When you create a new blog in standard configuration, +you must use the _blog_id_ with the trailing slash in blog URL setting like http://localhost/blog_id/ + +__Non standard configuration__ + +Setup nginx server configuration (see bellow): + * adapt _/var/www/dotclear/servers/*.conf_ to your needs +Then to configure blog: + * go to the administration interface at http://my_custom_domain/admin, * left side menu _Blog settings_ * panel _Advanced parameters_ - * set _Blog URL_ to http://localhost/ (with trailing slash) + * set _Blog URL_ to http://my_custom_domain/ (with trailing slash) * set _URL scan method_ to 'PATH_INFO' +Then fix public_path and public_url for the blog: + * go to the administration interface at http://my_custom_domain/admin, + * left side menu _about:config_ + * panel _system_ + * set _public_path_ to the real path on system to public directory of the blog + * set _public_url_ to the URL of the public directory of the blog + +### STRUCTURE + +Default root path of this image structure is in __/var/www/dotclear__ + * _app_ : Dotclear software files + * _blogs_ : Blogs public directories + * _cache_ : Dotclear template cache + * _plugins_ : Third party plugins directory + * _servers_ : Nginx servers configurations + * _var_ : Dotclear var directory + +### UPGRADE + +To upgrade Dotclear to next version, just pull latest image and restart the docker container (recommanded) +or use Dotclear buitin update system. + +Reminder: a dedicated dashboard is available at http://localhost/admin/upgrade.php ### TODO -* Disable upgrade from Dotclear. Should only use upgrade from container restart ? -* or Fix downgrade on container restart when Dotclear has been upgraded from UI. -* Use auto installation from container environment variables. * Add support of Dotclear's DEBUG mode for Dotclear and logs. * Add better cache management. From another container or from Dotclear container. * Add mail support. * Enhance server and php configuration. From x.conf files. -* Add builds from Alpine and Apache and maybe without FPM. ### CONTRIBUTING diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 0000000..fa5ef70 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,3 @@ +# Docker Dotclear Security Policy + +To report a Vulnerability or a security issue, please send a mail to \ No newline at end of file diff --git a/alpine/nginx/2.31/Dockerfile b/alpine/nginx/2.31/Dockerfile deleted file mode 100644 index 98c9a87..0000000 --- a/alpine/nginx/2.31/Dockerfile +++ /dev/null @@ -1,87 +0,0 @@ -# docker-dotclear:2.31-anf - -## -# Alpine -## - -FROM alpine:latest - -RUN echo "UTC" > /etc/timezone - -## -# Nginx -## - -RUN adduser -D -g 'www' www -RUN apk add --no-cache --update \ - nginx \ - curl \ - tar \ - unzip - -RUN mkdir -p /var/www/html \ - && chown -R www:www /var/lib/nginx \ - && chown -R www:www /var/www - -COPY nginx.conf /etc/nginx/nginx.conf - -WORKDIR /var/www/html - -## -# PHP -## - -ENV VER_PHP php83 - -RUN apk add --no-cache --update \ - ${VER_PHP}-common \ - ${VER_PHP}-cli \ - ${VER_PHP}-fpm \ - ${VER_PHP}-session \ - ${VER_PHP}-curl \ - ${VER_PHP}-gd \ - ${VER_PHP}-gmp \ - ${VER_PHP}-exif \ - ${VER_PHP}-tidy \ - ${VER_PHP}-intl \ - ${VER_PHP}-json \ - ${VER_PHP}-mbstring \ - ${VER_PHP}-iconv \ - ${VER_PHP}-gettext \ - ${VER_PHP}-mysqli \ - ${VER_PHP}-opcache \ - ${VER_PHP}-dom \ - ${VER_PHP}-xml \ - ${VER_PHP}-simplexml \ - ${VER_PHP}-zip \ - ${VER_PHP}-sqlite3 - -COPY php.ini /etc/${VER_PHP}/php.ini -COPY php-fpm.conf /etc/${VER_PHP}/php-fpm.d/www.conf - -## -# Dotclear -## - -ENV VER_DOTCLEAR 2.31 -ENV MD5_DOTCLEAR ec08bbcee14132ac7bcefb8ce5d415ed - -RUN mkdir -p /usr/src/dotclear \ - && curl -fsSL -o dotclear.zip "http://download.dotclear.org/attic/dotclear-${VER_DOTCLEAR}.zip" \ - && echo "$MD5_DOTCLEAR dotclear.zip" | md5sum -c - \ - && unzip -d /usr/src dotclear.zip \ - && rm dotclear.zip \ - && chown -R www:www /usr/src/dotclear \ - && chmod -R 755 /usr/src/dotclear/public /usr/src/dotclear/cache \ - && rm -f /var/www/html/* - -## -# END -## - -EXPOSE 80 - -ADD docker-entrypoint.sh /entrypoint.sh -ENTRYPOINT ["/bin/sh", "/entrypoint.sh"] - -HEALTHCHECK --timeout=10s CMD curl --silent --fail http://127.0.0.1:80/fpm-ping || exit 1 \ No newline at end of file diff --git a/alpine/nginx/2.31/docker-compose.yaml b/alpine/nginx/2.31/docker-compose.yaml deleted file mode 100644 index aa15140..0000000 --- a/alpine/nginx/2.31/docker-compose.yaml +++ /dev/null @@ -1,9 +0,0 @@ -# docker-dotclear:2.31-anf - -services: - dc_app: - build: - context: . - dockerfile: Dockerfile - image: docker-dotclear:2.31-anf - container_name: dotclear \ No newline at end of file diff --git a/alpine/nginx/2.31/nginx.conf b/alpine/nginx/2.31/nginx.conf deleted file mode 100644 index eeb1529..0000000 --- a/alpine/nginx/2.31/nginx.conf +++ /dev/null @@ -1,67 +0,0 @@ -; docker-dotclear:2.31-anf - -user www; -daemon off; -worker_processes auto; -error_log /dev/stderr notice; -pid /var/run/nginx/nginx.pid; - -events { - worker_connections 1024; -} - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - sendfile on; - #access_log /var/log/nginx/access.log; - keepalive_timeout 3000; - - server { - listen 80; - root /var/www/html; - index index.php index.html; - server_name localhost; - client_max_body_size 32m; - #error_page 500 502 503 504 /50x.html; - - location ~ ^/(db|cache|plugins|inc) { - deny all; - return 404; - } - - location / { - try_files $uri $uri/ @dotclear_path_info; - } - - location @dotclear_path_info { - rewrite ^/(.*) /index.php/$1 last; - } - - location ~ [^/]\.php(/|$) { - fastcgi_split_path_info ^(.+?\.php)(/.*)$; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - include fastcgi_params; - set $path_info $fastcgi_path_info; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info; - - #fastcgi_pass 127.0.0.1:9000; - fastcgi_pass unix:/run/php-fpm.sock; - fastcgi_index index.php; - } - - location ~ ^/(fpm-ping)$ { - access_log off; - allow 127.0.0.1; - deny all; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include fastcgi_params; - fastcgi_pass unix:/run/php-fpm.sock; - } - } -} \ No newline at end of file diff --git a/alpine/nginx/docker-compose.yaml b/alpine/nginx/docker-compose.yaml deleted file mode 100644 index 41e219a..0000000 --- a/alpine/nginx/docker-compose.yaml +++ /dev/null @@ -1,30 +0,0 @@ -services: - - # MYSQL database service - dc_db: - image: mariadb:latest - container_name: dotcleardb - restart: always - command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW - volumes: - - dc_db:/var/lib/mysql - environment: - MYSQL_ROOT_PASSWORD: dotclear_root - MYSQL_DATABASE: dotclear_db - MYSQL_USER: dotclear_user - MYSQL_PASSWORD: dotclear_pwd - - # PHP-FPM Service - dc_app: - image: jcpd/docker-dotclear:2.31-anf - container_name: dotclearphp - volumes: - - dc_app:/var/www/html - ports: - - 8080:80 - depends_on: - - dc_db # MYSQL database service - -volumes: - dc_app: # NGINX volume - dc_db: # MYSQL volume \ No newline at end of file diff --git a/alpine/nginx/latest/Dockerfile b/alpine/nginx/latest/Dockerfile deleted file mode 100644 index 7924ef0..0000000 --- a/alpine/nginx/latest/Dockerfile +++ /dev/null @@ -1,87 +0,0 @@ -# docker-dotclear:latest - -## -# Alpine -## - -FROM alpine:latest - -RUN echo "UTC" > /etc/timezone - -## -# Nginx -## - -RUN adduser -D -g 'www' www -RUN apk add --no-cache --update \ - nginx \ - curl \ - tar \ - unzip - -RUN mkdir -p /var/www/html \ - && chown -R www:www /var/lib/nginx \ - && chown -R www:www /var/www - -COPY nginx.conf /etc/nginx/nginx.conf - -WORKDIR /var/www/html - -## -# PHP -## - -ENV VER_PHP php83 - -RUN apk add --no-cache --update \ - ${VER_PHP}-common \ - ${VER_PHP}-cli \ - ${VER_PHP}-fpm \ - ${VER_PHP}-session \ - ${VER_PHP}-curl \ - ${VER_PHP}-gd \ - ${VER_PHP}-gmp \ - ${VER_PHP}-exif \ - ${VER_PHP}-tidy \ - ${VER_PHP}-intl \ - ${VER_PHP}-json \ - ${VER_PHP}-mbstring \ - ${VER_PHP}-iconv \ - ${VER_PHP}-gettext \ - ${VER_PHP}-mysqli \ - ${VER_PHP}-opcache \ - ${VER_PHP}-dom \ - ${VER_PHP}-xml \ - ${VER_PHP}-simplexml \ - ${VER_PHP}-zip \ - ${VER_PHP}-sqlite3 - -COPY php.ini /etc/${VER_PHP}/php.ini -COPY php-fpm.conf /etc/${VER_PHP}/php-fpm.d/www.conf - -## -# Dotclear -## - -ENV VER_DOTCLEAR 2.31 -ENV MD5_DOTCLEAR ec08bbcee14132ac7bcefb8ce5d415ed - -RUN mkdir -p /usr/src/dotclear \ - && curl -fsSL -o dotclear.zip "http://download.dotclear.org/attic/dotclear-${VER_DOTCLEAR}.zip" \ - && echo "$MD5_DOTCLEAR dotclear.zip" | md5sum -c - \ - && unzip -d /usr/src dotclear.zip \ - && rm dotclear.zip \ - && chown -R www:www /usr/src/dotclear \ - && chmod -R 755 /usr/src/dotclear/public /usr/src/dotclear/cache \ - && rm -f /var/www/html/* - -## -# END -## - -EXPOSE 80 - -ADD docker-entrypoint.sh /entrypoint.sh -ENTRYPOINT ["/bin/sh", "/entrypoint.sh"] - -HEALTHCHECK --timeout=10s CMD curl --silent --fail http://127.0.0.1:80/fpm-ping || exit 1 \ No newline at end of file diff --git a/alpine/nginx/latest/docker-compose.yaml b/alpine/nginx/latest/docker-compose.yaml deleted file mode 100644 index 22ae7d8..0000000 --- a/alpine/nginx/latest/docker-compose.yaml +++ /dev/null @@ -1,9 +0,0 @@ -# docker-dotclear:latest - -services: - dc_app: - build: - context: . - dockerfile: Dockerfile - image: docker-dotclear:latest - container_name: dotclear \ No newline at end of file diff --git a/alpine/nginx/latest/docker-entrypoint.sh b/alpine/nginx/latest/docker-entrypoint.sh deleted file mode 100644 index bf204de..0000000 --- a/alpine/nginx/latest/docker-entrypoint.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh - -# docker-dotclear:latest - -set -e - -# Check if Dotclear exists -if ! [ -e index.php -a -e src/App.php ]; then - # First installation - echo >&2 "Dotclear not found in $(pwd) - copying now..." - if [ "$(ls -A)" ]; then - echo >&2 "WARNING: $(pwd) is not empty - press Ctrl+C now if this is an error!" - ( set -x; ls -A; sleep 5 ) - fi - echo >&2 "Copying Dotclear files..." - tar cf - --one-file-system -C /usr/src/dotclear . | tar xf - - echo >&2 "Complete! Dotclear has been successfully copied to $(pwd)" -else - echo >&2 "Dotclear found in $(pwd), checking upgrade..." - # Check if Dotclear needs upgrade - VER_CURRENT=$(sed -n "s/^\s*\"release_version\":\s*\"\(.*\)\",/\1/p" release.json) - if [ "$VER_CURRENT" != "$VER_DOTCLEAR" ]; then - echo >&2 "Upgrading Dotclear files from ${VER_CURRENT} to ${VER_DOTCLEAR}, please wait..." - tar cf - --one-file-system -C /usr/src/dotclear . | tar xf - - echo >&2 "Complete! Dotclear files have been successfully upgraded to ${VER_DOTCLEAR}" - else - echo >&2 "No need to upgrade Dotclear ${VER_DOTCLEAR}" - fi -fi - -# Permissions -echo >&2 "Setting up permissions..." -chown -R www:www /var/www/html - -# Summary -echo >&2 "Alpine $(cat /etc/alpine-release)" -echo >&2 "$(nginx -v)PHP $(php -r "echo PHP_VERSION;")" -echo >&2 "Dotclear: ${VER_DOTCLEAR}" - -php-fpm83 -D # FPM must start first in daemon mode -nginx # Then nginx in no daemon mode - -exec "$@" \ No newline at end of file diff --git a/alpine/nginx/latest/nginx.conf b/alpine/nginx/latest/nginx.conf deleted file mode 100644 index 074f191..0000000 --- a/alpine/nginx/latest/nginx.conf +++ /dev/null @@ -1,67 +0,0 @@ -; docker-dotclear:latest - -user www; -daemon off; -worker_processes auto; -error_log /dev/stderr notice; -pid /var/run/nginx/nginx.pid; - -events { - worker_connections 1024; -} - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - sendfile on; - #access_log /var/log/nginx/access.log; - keepalive_timeout 3000; - - server { - listen 80; - root /var/www/html; - index index.php index.html; - server_name localhost; - client_max_body_size 32m; - #error_page 500 502 503 504 /50x.html; - - location ~ ^/(db|cache|plugins|inc) { - deny all; - return 404; - } - - location / { - try_files $uri $uri/ @dotclear_path_info; - } - - location @dotclear_path_info { - rewrite ^/(.*) /index.php/$1 last; - } - - location ~ [^/]\.php(/|$) { - fastcgi_split_path_info ^(.+?\.php)(/.*)$; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - include fastcgi_params; - set $path_info $fastcgi_path_info; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info; - - #fastcgi_pass 127.0.0.1:9000; - fastcgi_pass unix:/run/php-fpm.sock; - fastcgi_index index.php; - } - - location ~ ^/(fpm-ping)$ { - access_log off; - allow 127.0.0.1; - deny all; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include fastcgi_params; - fastcgi_pass unix:/run/php-fpm.sock; - } - } -} \ No newline at end of file diff --git a/alpine/nginx/latest/php-fpm.conf b/alpine/nginx/latest/php-fpm.conf deleted file mode 100644 index f62e7e2..0000000 --- a/alpine/nginx/latest/php-fpm.conf +++ /dev/null @@ -1,21 +0,0 @@ -; docker-dotclear:latest - -[global] -error_log = /dev/stderr -pid = /var/run/php-fpm.pid - -[www] -user = www -group = www -listen = /run/php-fpm.sock -listen.owner = www -listen.group = www -listen.mode = 0660 -pm = ondemand -pm.max_children = 100 -pm.process_idle_timeout = 10s; -pm.max_requests = 1000 -ping.path = /fpm-ping -catch_workers_output = yes -decorate_workers_output = no -clear_env = no diff --git a/alpine/nginx/latest/php.ini b/alpine/nginx/latest/php.ini deleted file mode 100644 index 4c8f33e..0000000 --- a/alpine/nginx/latest/php.ini +++ /dev/null @@ -1,116 +0,0 @@ -; docker-dotclear:latest - -[PHP] - -engine = On -short_open_tag = Off -precision = 14 -output_buffering = 4096 -zlib.output_compression = Off -implicit_flush = Off -unserialize_callback_func = -serialize_precision = -1 -disable_functions = -disable_classes = -zend.enable_gc = On -zend.exception_ignore_args = On -zend.exception_string_param_max_len = 0 - -expose_php = On - -max_execution_time = 30 -max_input_time = 60 -memory_limit = 512M -max_input_vars = 1500 - -error_reporting = E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR -display_errors = On -display_startup_errors = On -log_errors = On -ignore_repeated_errors = Off -ignore_repeated_source = Off -report_memleaks = On -error_log = /dev/stderr - -variables_order = "GPCS" -request_order = "GP" -register_argc_argv = Off -auto_globals_jit = On -post_max_size = 100M -auto_prepend_file = -auto_append_file = -default_mimetype = "text/html" -default_charset = "UTF-8" - -include_path = ".:/usr/share/php83" -doc_root = -user_dir = -enable_dl = Off - -file_uploads = On -upload_max_filesize = 50M -max_file_uploads = 200 - -allow_url_fopen = On -allow_url_include = Off -default_socket_timeout = 60 - -[CLI Server] -cli_server.color = On - -[mail function] -SMTP = localhost -smtp_port = 25 -mail.add_x_header = Off -mail.mixed_lf_and_crlf = Off - -[MySQLi] -mysqli.max_persistent = -1 -mysqli.allow_persistent = On -mysqli.max_links = -1 -mysqli.default_port = 3306 -mysqli.default_socket = -mysqli.default_host = -mysqli.default_user = -mysqli.default_pw = - -[PostgreSQL] -pgsql.allow_persistent = On -pgsql.auto_reset_persistent = Off -pgsql.max_persistent = -1 -pgsql.max_links = -1 -pgsql.ignore_notice = 0 -pgsql.log_notice = 0 - -[Session] -session.save_handler = files -session.use_strict_mode = 0 -session.use_cookies = 1 -session.use_only_cookies = 1 -session.name = PHPSESSID -session.auto_start = 0 -session.cookie_lifetime = 0 -session.cookie_path = / -session.cookie_domain = -session.cookie_httponly = -session.cookie_samesite = -session.serialize_handler = php -session.gc_probability = 1 -session.gc_divisor = 1000 -session.gc_maxlifetime = 1440 -session.referer_check = -session.cache_limiter = nocache -session.cache_expire = 180 -session.use_trans_sid = 0 -session.sid_length = 26 -session.trans_sid_tags = "a=href,area=href,frame=src,form=" -session.sid_bits_per_character = 5 - -[opcache] -opcache.enable=1 -opcache.enable_cli=1 -opcache.memory_consumption=128 -opcache.interned_strings_buffer=8 -opcache.max_accelerated_files=4000 -opcache.revalidate_freq=2 - diff --git a/debian/nginx/2.31/Dockerfile b/debian/nginx/2.31/Dockerfile deleted file mode 100644 index ff9172a..0000000 --- a/debian/nginx/2.31/Dockerfile +++ /dev/null @@ -1,60 +0,0 @@ -# docker-dotclear:2.31-dnf -# Debian 12.7 / nginx 1.22.1 / php-fpm 8.3 -FROM php:8.3-fpm - -# Dotclear version -ENV DOTCLEAR_VERSION 2.31 -ENV DOTCLEAR_MD5 ec08bbcee14132ac7bcefb8ce5d415ed - -# Required system packages -RUN set -x; \ - apt-get update \ - && apt-get install -y nginx \ - && apt-get install -y --no-install-recommends \ - postgresql-server-dev-all \ - libfreetype6-dev \ - libjpeg62-turbo-dev \ - libpng-dev \ - libonig-dev \ - rsync \ - unzip \ - && rm -r /var/lib/apt/lists/* - -# Required php packages -RUN docker-php-ext-install opcache mbstring pgsql mysqli \ - && docker-php-ext-configure gd --with-freetype --with-jpeg \ - && docker-php-ext-install gd - -# Opcache -RUN { \ - echo 'opcache.memory_consumption=128'; \ - echo 'opcache.interned_strings_buffer=8'; \ - echo 'opcache.max_accelerated_files=4000'; \ - echo 'opcache.revalidate_freq=2'; \ - echo 'opcache.fast_shutdown=1'; \ - echo 'opcache.enable_cli=1'; \ - } > /usr/local/etc/php/conf.d/php-opocache-cfg.ini - -# Web server configuartion -RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" -COPY server.conf /etc/nginx/conf.d/default.conf - -WORKDIR /var/www/html -EXPOSE 80 - -# Get Dotclear -RUN mkdir -p /usr/src/dotclear \ - && curl -fsSL -o dotclear.zip "http://download.dotclear.org/attic/dotclear-${DOTCLEAR_VERSION}.zip" \ - && echo "$DOTCLEAR_MD5 dotclear.zip" | md5sum -c - \ - && unzip -d /usr/src dotclear.zip \ - && rm dotclear.zip \ - && chown -R www-data:www-data /usr/src/dotclear \ - && chmod -R 755 /usr/src/dotclear/public /usr/src/dotclear/cache \ - && rm -f /var/www/html/* - -# Entrypoint -ADD ../docker-entrypoint.sh /entrypoint.sh -ENTRYPOINT ["/entrypoint.sh"] - -# Container healthcheck -HEALTHCHECK --timeout=10s CMD curl --silent --fail http://127.0.0.1:8080/fpm-ping || exit 1 \ No newline at end of file diff --git a/debian/nginx/2.31/docker-compose.yaml b/debian/nginx/2.31/docker-compose.yaml deleted file mode 100644 index 71568cb..0000000 --- a/debian/nginx/2.31/docker-compose.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# docker-dotclear:2.31-dnf -services: - dc_app: - build: - context: . - dockerfile: Dockerfile - image: docker-dotclear:2.31-dnf # debian nginx php-fpm - container_name: dotclear \ No newline at end of file diff --git a/debian/nginx/2.31/docker-entrypoint.sh b/debian/nginx/2.31/docker-entrypoint.sh deleted file mode 100644 index 85a92a8..0000000 --- a/debian/nginx/2.31/docker-entrypoint.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -# docker-dotclear:2.31-dnf - -set -e - -# Check if Dotclear exists -if ! [ -e index.php -a -e src/App.php ]; then - # First installation - echo >&2 "Dotclear not found in $(pwd) - copying now..." - if [ "$(ls -A)" ]; then - echo >&2 "WARNING: $(pwd) is not empty - press Ctrl+C now if this is an error!" - ( set -x; ls -A; sleep 10 ) - fi - tar cf - --one-file-system -C /usr/src/dotclear . | tar xf - - echo >&2 "Complete! Dotclear has been successfully copied to $(pwd)" -else - echo >&2 "Dotclear found in $(pwd), checking upgrade..." - # Check if Dotclear needs upgrade - DOTCLEAR_CURRENT_VERSION=$(sed -n "s/^\s*\"release_version\":\s*\"\(.*\)\",/\1/p" release.json) - if [ "$DOTCLEAR_CURRENT_VERSION" != "$DOTCLEAR_VERSION" ]; then - echo >&2 "Upgrading Dotclear files from ${DOTCLEAR_CURRENT_VERSION} to ${DOTCLEAR_VERSION}, please wait..." - tar cf - --one-file-system -C /usr/src/dotclear . | tar xf - - echo >&2 "Complete! Dotclear files have been successfully upgraded to ${DOTCLEAR_VERSION}" - else - echo >&2 "No need to upgrade Dotclear ${DOTCLEAR_VERSION}" - fi -fi - -# Permissions -chown -R www-data:www-data /var/www/html - -# Summary -echo >&2 "Starting services..." -echo >&2 "Debian $(cat /etc/debian_version)" -echo >&2 "$(nginx -v)PHP: $(php -r "echo PHP_VERSION;")" -echo >&2 "Dotclear: ${DOTCLEAR_VERSION}" - -# Start services (in right order) -php-fpm -D -nginx -g 'daemon off;' - -exec "$@" \ No newline at end of file diff --git a/debian/nginx/2.31/server.conf b/debian/nginx/2.31/server.conf deleted file mode 100644 index a6a8bbb..0000000 --- a/debian/nginx/2.31/server.conf +++ /dev/null @@ -1,37 +0,0 @@ -# docker-dotclear:2.31-dnf -# nginx php-fpm server configuration to rewrite Dotclear's URL -server { - listen 80; - server_name localhost; - root /var/www/html; - - index index.php; - - location ~ ^/(db|cache|plugins|inc) { - deny all; - return 404; - } - - location / { - try_files $uri $uri/ @dotclear_path_info; - } - - location @dotclear_path_info { - rewrite ^/(.*) /index.php/$1 last; - } - - location ~ [^/]\.php(/|$) { - fastcgi_split_path_info ^(.+?\.php)(/.*)$; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info; - - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - } -} \ No newline at end of file diff --git a/debian/nginx/docker-compose.yaml b/debian/nginx/docker-compose.yaml deleted file mode 100644 index b20ce9e..0000000 --- a/debian/nginx/docker-compose.yaml +++ /dev/null @@ -1,30 +0,0 @@ -services: - - # MYSQL database service - dc_db: - image: mariadb:latest - container_name: dotcleardb - restart: always - command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW - volumes: - - dc_db:/var/lib/mysql - environment: - MYSQL_ROOT_PASSWORD: dotclear_root - MYSQL_DATABASE: dotclear_db - MYSQL_USER: dotclear_user - MYSQL_PASSWORD: dotclear_pwd - - # PHP-FPM Service - dc_app: - image: jcpd/docker-dotclear:2.31-dnf - container_name: dotclearphp - volumes: - - dc_app:/var/www/html - ports: - - 8080:80 - depends_on: - - dc_db # MYSQL database service - -volumes: - dc_app: # NGINX volume - dc_db: # MYSQL volume \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 0000000..5d26fe5 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,41 @@ +services: + + # MYSQL database service + dc_db: + image: mariadb:latest + container_name: dotcleardb + restart: unless-stopped + command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW + volumes: + - dc_db:/var/lib/mysql + environment: + MYSQL_ROOT_PASSWORD: dotclear_root + MYSQL_DATABASE: dotclear_db + MYSQL_USER: dotclear_user + MYSQL_PASSWORD: dotclear_pwd + + # Dotclear server service + dc_app: + image: jcpd/docker-dotclear:latest + container_name: dotclearphp + restart: unless-stopped + volumes: + #- dc_app:/var/www/dotclear # docker volume or + - ./dotclear:/var/www/dotclear # system path + ports: + - 80:80 + depends_on: + - dc_db # MYSQL database service + environment: + # These variables are only used for first install, see inc/config.php + DC_DBDRIVER: mysqlimb4 # MYSQL full UTF-8 + DC_DBHOST: dc_db # MYSQL database service + DC_DBNAME: dotclear_db # MYSQL_DATABASE + DC_DBUSER: dotclear_user # MYSQL_USER + DC_DBPASSWORD: dotclear_pwd # MYSQL_PASSWORD + DC_DBPREFIX: dc_ # Database tables prefix + DC_ADMINMAILFROM: contact@exemple.com # Dotclear mail from + +volumes: +# dc_app: # Dotclear volume + dc_db: # MYSQL volume \ No newline at end of file diff --git a/alpine/nginx/2.31/docker-entrypoint.sh b/docker-entrypoint.sh similarity index 65% rename from alpine/nginx/2.31/docker-entrypoint.sh rename to docker-entrypoint.sh index d060dc2..a2815e0 100644 --- a/alpine/nginx/2.31/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -1,10 +1,17 @@ #!/bin/sh -# docker-dotclear:2.31-anf +# docker-dotclear:x.x-anf +# Container starting script set -e -# Check if Dotclear exists +# Read image version +export VER_DOTCLEAR=$(sed -n "s/^\s*\"release_version\":\s*\"\(.*\)\",/\1/p" /usr/src/dotclear/release.json) + +# Simple versions comparison function that works with Dotclear versioning +function version { echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }'; } + +# Check if Dotclear is already on system if ! [ -e index.php -a -e src/App.php ]; then # First installation echo >&2 "Dotclear not found in $(pwd) - copying now..." @@ -12,6 +19,8 @@ if ! [ -e index.php -a -e src/App.php ]; then echo >&2 "WARNING: $(pwd) is not empty - press Ctrl+C now if this is an error!" ( set -x; ls -A; sleep 5 ) fi + echo >&2 "Copying Dotclear structure..." + cp -R /var/lib/dotclear /var/www echo >&2 "Copying Dotclear files..." tar cf - --one-file-system -C /usr/src/dotclear . | tar xf - echo >&2 "Complete! Dotclear has been successfully copied to $(pwd)" @@ -19,7 +28,7 @@ else echo >&2 "Dotclear found in $(pwd), checking upgrade..." # Check if Dotclear needs upgrade VER_CURRENT=$(sed -n "s/^\s*\"release_version\":\s*\"\(.*\)\",/\1/p" release.json) - if [ "$VER_CURRENT" != "$VER_DOTCLEAR" ]; then + if [ $(version $VER_DOTCLEAR) -gt $(version $VER_CURRENT) ]; then echo >&2 "Upgrading Dotclear files from ${VER_CURRENT} to ${VER_DOTCLEAR}, please wait..." tar cf - --one-file-system -C /usr/src/dotclear . | tar xf - echo >&2 "Complete! Dotclear files have been successfully upgraded to ${VER_DOTCLEAR}" @@ -28,15 +37,16 @@ else fi fi -# Permissions +# Fix www permissions echo >&2 "Setting up permissions..." -chown -R www:www /var/www/html +chown -R www:www /var/www/dotclear -# Summary +# Print summary to docker logs echo >&2 "Alpine $(cat /etc/alpine-release)" echo >&2 "$(nginx -v)PHP $(php -r "echo PHP_VERSION;")" echo >&2 "Dotclear: ${VER_DOTCLEAR}" +# Start web server php-fpm83 -D # FPM must start first in daemon mode nginx # Then nginx in no daemon mode diff --git a/etc/nginx.conf b/etc/nginx.conf new file mode 100644 index 0000000..830d8f7 --- /dev/null +++ b/etc/nginx.conf @@ -0,0 +1,20 @@ +# /etc/nginx/nginx.conf +# Nginx configuration + +user www; +daemon off; +worker_processes auto; +error_log /dev/stderr notice; +pid /var/run/nginx/nginx.pid; + +events { + worker_connections 1024; +} + +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + sendfile on; + keepalive_timeout 3000; + include /var/www/dotclear/servers/*.conf; +} \ No newline at end of file diff --git a/alpine/nginx/2.31/php-fpm.conf b/etc/php-fpm.conf similarity index 82% rename from alpine/nginx/2.31/php-fpm.conf rename to etc/php-fpm.conf index 4b40b35..9986348 100644 --- a/alpine/nginx/2.31/php-fpm.conf +++ b/etc/php-fpm.conf @@ -1,4 +1,5 @@ -; docker-dotclear:2.31-anf +; /etc/phpXX/php-fpm.d/www.conf +; PHP-FPM configuration [global] error_log = /dev/stderr diff --git a/alpine/nginx/2.31/php.ini b/etc/php.ini similarity index 93% rename from alpine/nginx/2.31/php.ini rename to etc/php.ini index 7abbfe2..483d39a 100644 --- a/alpine/nginx/2.31/php.ini +++ b/etc/php.ini @@ -1,4 +1,5 @@ -; docker-dotclear:2.31-anf +; /etc/phpXX/php.ini +; PHP configuration [PHP] diff --git a/etc/snippets_blogs.conf b/etc/snippets_blogs.conf new file mode 100644 index 0000000..96248c0 --- /dev/null +++ b/etc/snippets_blogs.conf @@ -0,0 +1,31 @@ +# /etc/nginx/snippets/snippets_blogs.conf +# Dotclear nginx default server blogs configurations + +listen 80; +index index.php index.html; +root /var/www/dotclear/app; +client_max_body_size 32m; +set $dc_blog_id default; + +# Blogs public paths +location ~ /([^/]+)/public { + root /var/www/dotclear/blogs; + rewrite /([^/]+)/public/(.*) /$1/$2 break; + try_files $uri =404; +} + +# Dotclear files +location / { + set $dc_blog_id default; + try_files $uri $uri/ @dotclear_path_info; +} + +# Blogs path_info URL +location @dotclear_path_info { + # URI first part is blog id + if ($request_uri ~ ^/([^/]+)) { + set $dc_blog_id $1; + rewrite ^/([^/]+)(/.*|$) /index.php$2 last; + } + rewrite ^/(.*) /index.php/$1 last; +} diff --git a/etc/snippets_common.conf b/etc/snippets_common.conf new file mode 100644 index 0000000..b736e73 --- /dev/null +++ b/etc/snippets_common.conf @@ -0,0 +1,36 @@ +# /etc/nginx/snippets/snippets_commmon.conf +# Dotclear nginx default server common configurations + +# Disable some dotclear paths +location ~ ^/(db|cache|plugins|inc|var) { + deny all; + return 404; +} + +# Docker healthcheck +location ~ ^/(fpm-ping)$ { + access_log off; + allow 127.0.0.1; + deny all; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include fastcgi_params; + fastcgi_pass unix:/run/php-fpm.sock; +} + +# Dotclear .php files +location ~ [^/]\.php(/|$) { + fastcgi_split_path_info ^(.+?\.php)(/.*)$; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + include fastcgi_params; + set $path_info $fastcgi_path_info; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info; + fastcgi_param DC_BLOG_ID $dc_blog_id; + fastcgi_pass unix:/run/php-fpm.sock; + fastcgi_index index.php; +} + diff --git a/www/blogs/index.php b/www/blogs/index.php new file mode 100644 index 0000000..4debc31 --- /dev/null +++ b/www/blogs/index.php @@ -0,0 +1,2 @@ +registerModule( + 'DockerDotclear', + 'Helpers for dotclear docker image', + 'Jean-Christian Paul Denis', + '2.31' +); diff --git a/www/plugins/DockerDotclear/src/Backend.php b/www/plugins/DockerDotclear/src/Backend.php new file mode 100644 index 0000000..f6983c4 --- /dev/null +++ b/www/plugins/DockerDotclear/src/Backend.php @@ -0,0 +1,44 @@ +addBehaviors([ + 'adminAfterBlogCreate' => function (Cursor $cur, string $blog_id, BlogSettingsInterface $blog_settings) { + Files::makeDir(My::settings()->get('public_root') . '/' . $blog_id, true); + $blog_settings->system->put('public_path', My::settings()->get('public_root') . '/' . $blog_id); + $blog_settings->system->put('public_url', '/' . $blog_id . '/public'); + }, + ]); + + return true; + } +} diff --git a/www/plugins/DockerDotclear/src/Install.php b/www/plugins/DockerDotclear/src/Install.php new file mode 100644 index 0000000..b54715f --- /dev/null +++ b/www/plugins/DockerDotclear/src/Install.php @@ -0,0 +1,63 @@ +put('public_root', My::DOCKER_DOTCLEAR_PUBLIC_ROOT, 'string', 'Blogs public root path', false, true); + + # On first insall, update default blog parameters + if (App::version()->getVersion(My::id()) === '') { + $blog_id = 'default'; + + # Fix default blog public path + $blog_settings = App::blogSettings()->createFromBlog($blog_id); + $blog_settings->get('system')->put('public_path', My::DOCKER_DOTCLEAR_PUBLIC_ROOT . '/' . $blog_id); + $blog_settings->get('system')->put('public_url', '/' . $blog_id . '/public'); + $blog_settings->get('system')->put('url_scan', 'path_info'); + + # Fix default blog URL + $cur = App::blog()->openBlogCursor(); + $cur->blog_url = Http::getHost() . '/' . $blog_id . '/'; + $sql = new UpdateStatement(); + $sql + ->where('blog_id ' . $sql->in($blog_id)) + ->update($cur); + } + + return true; + } catch (Exception $e) { + App::error()->add($e->getMessage()); + + return false; + } + } +} diff --git a/www/plugins/DockerDotclear/src/My.php b/www/plugins/DockerDotclear/src/My.php new file mode 100644 index 0000000..160a4a8 --- /dev/null +++ b/www/plugins/DockerDotclear/src/My.php @@ -0,0 +1,26 @@ +addUserAction( + 'settings', + 'delete_all', + My::id() + ) + ->addUserAction( + 'plugins', + 'delete', + My::id() + ) + ->addUserAction( + 'versions', + 'delete', + My::id() + ) + + ->addDirectAction( + 'plugins', + 'delete', + My::id() + ) + ->addDirectAction( + 'versions', + 'delete', + My::id() + ) + ; + + return false; + } +} diff --git a/www/servers/default.conf b/www/servers/default.conf new file mode 100644 index 0000000..f1f7e73 --- /dev/null +++ b/www/servers/default.conf @@ -0,0 +1,19 @@ +# /var/www/dotclear/servers/default.conf +# Default nginx server + +server { + server_name localhost; + + # By default, server URLs look like: + # - http://localhost/default + # - http://localhost/blog2 + # - ... + include /etc/nginx/snippets/*.conf; + + # To use custom domains only use + # include /etc/nginx/snippets/snippets_common.conf; + # Adapt to your needs here the content of + # /etc/nginx/snippets/snippets_blogs.conf + # Then disable the Dotclear plugin DockerDotclear + # (or change its setting public_root) +} \ No newline at end of file