commit 7390c5d9be2670cbcf655ccceaef0d755293dfec Author: bach Date: Tue Jun 18 15:03:29 2024 +0200 docker env is working diff --git a/.env b/.env new file mode 100644 index 0000000..b9462a9 --- /dev/null +++ b/.env @@ -0,0 +1,13 @@ +COMPOSE_PROJECT_NAME=caravane + +API_ROOT=./api +APP_ROOT=./app +LOG_ROOT=./log + +DB_IMPORTE_FILE=./ressources/caravane.sql +DB_ROOT_PASSWORD=caravane +DB_NAME=caravane +DB_USERNAME=caravane +DB_PASSWORD=caravane + +XDEBUG_INI=./ressources/xdebug.ini diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bdba8c1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +app/* +api/* +log/* +*.sql +*.gz diff --git a/Docker/api/Dockerfile b/Docker/api/Dockerfile new file mode 100644 index 0000000..b3bef3f --- /dev/null +++ b/Docker/api/Dockerfile @@ -0,0 +1,72 @@ +FROM php:8.2-fpm + +RUN apt-get update && apt-get install -y \ + libfreetype6-dev \ + libjpeg62-turbo-dev \ + libmcrypt-dev \ + libpng-dev \ + mariadb-client \ + zip \ + libzip-dev + # docker-php-ext-install -j$(nproc) iconv && \ +RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ && \ + apt-get install -y imagemagick libmagickwand-dev && \ + pecl install imagick && docker-php-ext-enable imagick && \ + docker-php-ext-install -j$(nproc) gd && \ + docker-php-ext-install pdo_mysql zip && \ + docker-php-ext-install opcache && \ + docker-php-ext-install bcmath && \ + apt-get install -y git vim + +RUN pecl install redis-5.3.7 && \ + pecl install xdebug-3.3.2 && \ + docker-php-ext-enable redis xdebug + +RUN export COMPOSER_HOME=/usr/local/composer && \ + curl -sS https://getcomposer.org/installer \ + | php -- --install-dir=/usr/local/bin --filename=composer && \ + curl https://drupalconsole.com/installer \ + -L -o /usr/local/bin/drupal && \ + chmod +x /usr/local/bin/drupal && \ + curl https://github.com/drush-ops/drush-launcher/releases/download/0.6.0/drush.phar \ + -L -o /usr/local/bin/drush && \ + chmod +x /usr/local/bin/drush + +# TODO depecrated https://github.com/nodesource/distributions +# RUN apt-get install -y curl && \ +# curl -sL https://deb.nodesource.com/setup_11.x | bash - && \ +# curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ +# echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \ +# apt-get update && \ +# apt-get install -y nodejs yarn + +RUN apt-get install -y rsyslog +COPY ./rsyslog-drupal.conf /etc/rsyslog.d/drupal.conf +# ENTRYPOINT ["sh", "-c", "service rsyslog start ; tail -f /dev/null"] + +COPY ./php-custom.ini /usr/local/etc/php/conf.d/php-custom.ini +# COPY ./php-fpm-custom.conf /usr/local/etc/php-fpm.d/php-fpm-custom.conf + +# COPY ./bashrc /root/.bashrc +# COPY ./inputrc /root/.inputrc + +ARG USER_UID +ARG USER_UNAME +ARG USER_GID +ARG USER_GNAME + +RUN if getent group ${USER_GNAME} ; then groupdel ${USER_GNAME}; fi &&\ + groupadd -g ${USER_GID} ${USER_GNAME} &&\ + useradd -l -u ${USER_UID} -g ${USER_GNAME} ${USER_UNAME} &&\ + install -d -m 0755 -o ${USER_UNAME} -g ${USER_GNAME} /home/${USER_UNAME} &&\ + chown --changes --silent --no-dereference --recursive \ + --from=33:33 ${USER_UID}:${USER_GID} \ + /home/${USER_UNAME} + # /.composer \ + # /var/run/php-fpm \ + # /var/lib/php/sessions \ + +COPY ./bashrc /home/${USER_UNAME}/.bashrc +COPY ./inputrc /home/${USER_UNAME}/.inputrc + +USER ${USER_UNAME} diff --git a/Docker/api/bashrc b/Docker/api/bashrc new file mode 100644 index 0000000..6c45676 --- /dev/null +++ b/Docker/api/bashrc @@ -0,0 +1,4 @@ + +PS1='\e[36m\e[1mPHP-8.1\e[0m:\e[90m\w\e[0m\n$ ' +bind '"\e[A": history-search-backward' +bind '"\e[B": history-search-forward' diff --git a/Docker/api/inputrc b/Docker/api/inputrc new file mode 100644 index 0000000..db8d91d --- /dev/null +++ b/Docker/api/inputrc @@ -0,0 +1,2 @@ +set show-all-if-ambiguous on +set completion-ignore-case on diff --git a/Docker/api/php-custom.ini b/Docker/api/php-custom.ini new file mode 100644 index 0000000..ac5669b --- /dev/null +++ b/Docker/api/php-custom.ini @@ -0,0 +1,9 @@ +memory_limit = 8192M +upload_max_filesize = 50M +post_max_size = 50M +max_execution_time = 150 + +; Log level +; Possible Values: alert, error, warning, notice, debug +; Default Value: notice +log_level = debug diff --git a/Docker/api/php-fpm-custom.conf b/Docker/api/php-fpm-custom.conf new file mode 100644 index 0000000..8c6ab5d --- /dev/null +++ b/Docker/api/php-fpm-custom.conf @@ -0,0 +1 @@ +request_terminate_timeout = 150 diff --git a/Docker/api/rsyslog-drupal.conf b/Docker/api/rsyslog-drupal.conf new file mode 100644 index 0000000..145f7bb --- /dev/null +++ b/Docker/api/rsyslog-drupal.conf @@ -0,0 +1 @@ +local6.* /var/log/drupal.log diff --git a/Docker/api/rsyslog.service b/Docker/api/rsyslog.service new file mode 100644 index 0000000..19ac9dd --- /dev/null +++ b/Docker/api/rsyslog.service @@ -0,0 +1,17 @@ +[Unit] +Description=rsyslog +After=docker.service +Requires=docker.service + +[Service] +ExecStartPre=-/usr/bin/docker rm %n +ExecStart=/usr/bin/docker run --rm \ + --name %n \ + -h %H \ + jumanjiman/rsyslog +ExecStop=/usr/bin/docker stop %n +RestartSec=5s +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/Docker/app/Dockerfile b/Docker/app/Dockerfile new file mode 100644 index 0000000..23e10dd --- /dev/null +++ b/Docker/app/Dockerfile @@ -0,0 +1,39 @@ +FROM node:lts-bullseye + +# THE ALL USER THINGS IS USELESS AS NODE IS ALREADY A USER @ 1000 + +# RUN find / -group 1000 -exec chgrp -h node {} \; +# RUN find / -user 1000 -exec chown -h node {} \; + +# ARG USER_UID +# ARG USER_UNAME +# ARG USER_GID +# ARG USER_GNAME + + +# # RUN addgroup -g 1000 gdp && \ +# # adduser -h /home/gdp -D -u 1000 gdp && \ +# RUN adduser -u ${USER_UID} -G users -s /bin/sh -D ${USER_UNAME} +# # chown -R gdp:gdp /home/gdp + +# RUN if getent group ${USER_GNAME} ; then groupdel ${USER_GNAME}; fi +# RUN groupadd -g ${USER_GID} ${USER_GNAME} +# RUN useradd -l -u ${USER_UID} -g ${USER_GNAME} ${USER_UNAME} +# RUN install -d -m 0755 -o ${USER_UNAME} -g ${USER_GNAME} /home/${USER_UNAME} +# RUN chown --changes --silent --no-dereference --recursive \ +# --from=33:33 ${USER_UID}:${USER_GID} \ +# /home/${USER_UNAME} + +# USER ${USER_UNAME} + +# COPY ./bashrc /home/${USER_UNAME}/.bashrc +# COPY ./inputrc /home/${USER_UNAME}/.inputrc + +# COPY ./bashrc /home/node/.bashrc # should do an echo in already existing /home/node/.bashcr +COPY ./inputrc /home/node/.inputrc + +COPY ./client-entrypoint.sh /usr/local/bin +# USER root +RUN chmod +x /usr/local/bin/client-entrypoint.sh +# USER ${USER_UNAME} +CMD ["/bin/sh","/usr/local/bin/client-entrypoint.sh"] diff --git a/Docker/app/bashrc b/Docker/app/bashrc new file mode 100644 index 0000000..c5b03d2 --- /dev/null +++ b/Docker/app/bashrc @@ -0,0 +1,3 @@ +PS1='\e[36m\e[1mNODE\e[0m:\e[90m\w\e[0m\n$ ' +bind '"\e[A": history-search-backward' +bind '"\e[B": history-search-forward' diff --git a/Docker/app/client-entrypoint.sh b/Docker/app/client-entrypoint.sh new file mode 100644 index 0000000..48de690 --- /dev/null +++ b/Docker/app/client-entrypoint.sh @@ -0,0 +1,30 @@ +#!/bin/sh + +cat /etc/passwd|grep 1000 + +cd /app + +echo "Cleaning node_modules" +rm -rf node_modules + +echo "Cleaning npm cache" +npm cache clean --f + +echo "Npm install" +npm install + +# echo "Npm init" +# npm ci + + +# echo "Run npm dev" +# npm run dev +echo "APP_ENV $APP_ENV" + +if [ "$APP_ENV" = "prod" ]; then + echo "Run npm prod" + npm run build +else + echo "Run npm dev" + npm run dev +fi diff --git a/Docker/app/inputrc b/Docker/app/inputrc new file mode 100644 index 0000000..db8d91d --- /dev/null +++ b/Docker/app/inputrc @@ -0,0 +1,2 @@ +set show-all-if-ambiguous on +set completion-ignore-case on diff --git a/Docker/mysql/bashrc b/Docker/mysql/bashrc new file mode 100644 index 0000000..51fcb63 --- /dev/null +++ b/Docker/mysql/bashrc @@ -0,0 +1,4 @@ + +PS1='\e[36m\e[1mMYSQL\e[0m:\e[90m\w\e[0m\n$ ' +bind '"\e[A": history-search-backward' +bind '"\e[B": history-search-forward' diff --git a/Docker/mysql/mysql.cnf b/Docker/mysql/mysql.cnf new file mode 100644 index 0000000..0553107 --- /dev/null +++ b/Docker/mysql/mysql.cnf @@ -0,0 +1,12 @@ +[client] +default-character-set=utf8 + +[mysqld] +max_allowed_packet=500M + +collation-server = utf8_unicode_ci +init-connect='SET NAMES utf8' +character-set-server = utf8 + +[mysql] +default-character-set=utf8 diff --git a/Docker/nginx/Dockerfile b/Docker/nginx/Dockerfile new file mode 100644 index 0000000..aa36a6e --- /dev/null +++ b/Docker/nginx/Dockerfile @@ -0,0 +1,9 @@ +FROM nginx:latest + +RUN apt-get update \ + && apt-get install -y \ + vim + +COPY ./default.conf /etc/nginx/conf.d/default.conf +COPY ./bashrc /root/.bashrc +COPY ./inputrc /root/.inputrc diff --git a/Docker/nginx/bashrc b/Docker/nginx/bashrc new file mode 100644 index 0000000..74d78f9 --- /dev/null +++ b/Docker/nginx/bashrc @@ -0,0 +1,3 @@ +PS1='\e[36m\e[1mNGINX\e[0m:\e[90m\w\e[0m\n$ ' +bind '"\e[A": history-search-backward' +bind '"\e[B": history-search-forward' diff --git a/Docker/nginx/default.conf b/Docker/nginx/default.conf new file mode 100644 index 0000000..f1bf4ee --- /dev/null +++ b/Docker/nginx/default.conf @@ -0,0 +1,84 @@ +upstream app{ + server app:5173; +} + +server { + listen 80 default_server; + # root /var/www/html/api/src/web; + # root /var/www/html/app/dist; + index index.html index.php; + server_name *.caravane.fr; + + charset utf-8; + + location / { + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + proxy_set_header X-NginX-Proxy true; + proxy_set_header X-Ssl on; + proxy_cache off; + proxy_buffering off; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_pass http://app; + proxy_redirect off; + } + + # https://serversforhackers.com/c/nginx-php-in-subdirectory + location @api { + rewrite ^/api/(.*)$ /api/index.php; + } + + + location /api { + # rewrite /api/(.*)$ /$1 break; + # root /var/www/html/api/src/web; + alias /var/www/html/api/src/web/; + # index index.php; + # try_files $uri $uri/ /index.php?$query_string; + try_files $uri $uri/ @api; + + error_log /var/log/nginx/api-error.log debug; + + location ~ \.php$ { + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass api:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors off; + fastcgi_buffers 16 32k; + fastcgi_buffer_size 64k; + fastcgi_busy_buffers_size 64k; + fastcgi_read_timeout 150; + } + + } + + location = /favicon.ico { access_log off; log_not_found off; } + location = /robots.txt { access_log off; log_not_found off; } + + access_log on; + error_log /var/log/nginx/app-error.log error; + + sendfile off; + + client_max_body_size 100m; + + # location ~ \.php$ { + # fastcgi_split_path_info ^(.+\.php)(/.+)$; + # fastcgi_pass api:9000; + # fastcgi_index index.php; + # include fastcgi_params; + # fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + # fastcgi_intercept_errors off; + # fastcgi_buffer_size 16k; + # fastcgi_buffers 4 16k; + # fastcgi_read_timeout 150; + # } + + location ~ /\.ht { + deny all; + } +} diff --git a/Docker/nginx/inputrc b/Docker/nginx/inputrc new file mode 100644 index 0000000..db8d91d --- /dev/null +++ b/Docker/nginx/inputrc @@ -0,0 +1,2 @@ +set show-all-if-ambiguous on +set completion-ignore-case on diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) 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 +this service 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 make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. 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. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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 +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the 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 a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE 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. + + 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 +convey 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 General Public License as published by + the 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. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision 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, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This 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. diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..272e468 --- /dev/null +++ b/Makefile @@ -0,0 +1,83 @@ +#!/usr/bin/make + +SHELL = /bin/sh + +USER_UID := $(shell id -u) +USER_UNAME := $(shell id -un) +USER_GID := $(shell id -g) +USER_GNAME := $(shell id -gn) + +export USER_UID +export USER_UNAME +export USER_GID +export USER_GNAME + +pull: + docker-compose pull + +build: + docker-compose build --build-arg USER_UID=$(USER_UID) --build-arg USER_UNAME=$(USER_UNAME) --build-arg USER_GID=$(USER_GID) --build-arg USER_GNAME=$(USER_GNAME) + +buildnc: + docker-compose build --no-cache --build-arg USER_UID=$(USER_UID) --build-arg USER_UNAME=$(USER_UNAME) --build-arg USER_GID=$(USER_GID) --build-arg USER_GNAME=$(USER_GNAME) + +buildncapp: + docker-compose build --no-cache --build-arg USER_UID=$(USER_UID) --build-arg USER_UNAME=$(USER_UNAME) --build-arg USER_GID=$(USER_GID) --build-arg USER_GNAME=$(USER_GNAME) app + +buildnginx: + docker-compose build --build-arg USER_UID=$(USER_UID) --build-arg USER_UNAME=$(USER_UNAME) --build-arg USER_GID=$(USER_GID) --build-arg USER_GNAME=$(USER_GNAME) nginx + +buildncnginx: + docker-compose build --no-cache --build-arg USER_UID=$(USER_UID) --build-arg USER_UNAME=$(USER_UNAME) --build-arg USER_GID=$(USER_GID) --build-arg USER_GNAME=$(USER_GNAME) nginx + +downbuildup: down build up + +up: + docker-compose up -d + +ps: + docker-compose ps + +logs: + docker-compose logs -f + +api_maj_config: api_crd api_composer_install api_updb api_cim api_cr + +api_crd: + docker exec caravane-api-1 /bin/bash -c "drush cache-clear drush" + +api_cr: + docker exec caravane-api-1 /bin/bash -c "drush cr" + +api_updb: + docker exec caravane-api-1 /bin/bash -c "drush updb -y" + +api_cim: + docker exec caravane-api-1 /bin/bash -c "drush config-import -y" + +api_composer_install: + docker exec caravane-api-1 /bin/bash -c "composer install --no-dev" + +down: + docker-compose down + +exec_api: + docker exec -it caravane-api-1 bash + +restart_api: + docker-compose restart api + +exec_app: + docker exec -it caravane-app-1 bash + +restart_app: + docker-compose restart app + +exec_mysql: + docker exec -it caravane-mysql-1 bash + +restart_nginx: + docker-compose restart nginx + +dump_db: + docker exec caravane-mysql-1 sh -c 'exec mysqldump -uroot -pcaravane caravane' > ./ressources/caravane-$(DATE_NOW)-local.sql diff --git a/README.md b/README.md new file mode 100644 index 0000000..3d348fd --- /dev/null +++ b/README.md @@ -0,0 +1,253 @@ + +# Caravane des ruralité Docker Environement (drupal api + vuejs client) +Caravane des ruralités powered by druapl 10 for the api and vuejs for the app (client) in docker environement (nginx, php:8.3-fpm+drush, mysql, phpmyadmin, redis, npm) + +## Install docker +``` +sudo pacman -S docker docker-compose docker-machine +``` + +start the docker service +``` +sudo systemctl start docker +``` + +For all the following, DO NOT run docker or make commande as root or with sudo, use this setup: add your user to the docker user group, re-login, and restart docker.service. + +https://wiki.archlinux.org/index.php/Docker#Installation + +## Clone this repos + +this will clone this repos (main docker environement), the drupal 9 based api source code (without sites/default folder nor mysq ddb) and the vuejs app source code. + +``` +git clone --recursive -o figli https://figureslibres.io/gogs/bachir/docker-caravane.git +``` + +submodules : +- https://figureslibres.io/gogs/bachir/caravane-api +- https://figureslibres.io/gogs/bachir/caravane-app + +### setup /sites/default/settings.php + +```cp -r ressources/api/* api/src/web/sites/default/``` + +### get the sites/default/files folder +rsync the files from you know where (if you don't, you don't) to api/src/web/sites/default/files/ + +## Mysql +Copy your-sql-dump.sql into ./ressources/caravane.sql +It will be automaticly imported into the mysql container db (only) on the first ```make up``` + +## Hosts and reverse proxy + +add to your /etc/hosts : +``` +127.0.0.1 dev.caravane.fr +127.0.0.1 dev.phpmyadmin.caravane.fr +``` +configure your vhosts to add a reverse proxy that will redirect the dev.caravane.fr to our container +Apache +``` + + ServerName dev.caravane.fr + ProxyPass / http://127.0.0.1:8990/ + ProxyPassReverse / http://127.0.0.1:8990/ + ProxyRequests Off + ProxyPreserveHost On + proxy_buffer_size 128k; + proxy_buffers 4 256k; + proxy_busy_buffers_size 256k; + +``` +``` + + ServerName dev.phpmyadmin.caravane.fr + ProxyPass / http://127.0.0.1:8991/ + ProxyPassReverse / http://127.0.0.1:8991/ + ProxyRequests Off + ProxyPreserveHost On + proxy_buffer_size 128k; + proxy_buffers 4 256k; + proxy_busy_buffers_size 256k; + +``` +nginx +``` +server { + listen 80; + server_name dev.caravane.fr; + + access_log off; + error_log /var/log/nginx/caravane/error.log error; + + client_max_body_size 100m; + + location / { + proxy_pass http://127.0.0.1:8990; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_buffer_size 128k; + proxy_buffers 4 256k; + proxy_busy_buffers_size 256k; + } + } + server { + listen 80; + server_name dev.phpmyadmin.caravane.com; + + location / { + proxy_pass http://127.0.0.1:8991; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_buffer_size 128k; + proxy_buffers 4 256k; + proxy_busy_buffers_size 256k; + } + } +``` + +## Docker + +### docker-compose pull +pull the latest image of services +``` +make pull +``` + +### build +only before the first run (may take some time) +``` +make build +``` +/!\ DO NOT use ```docker-compose build```, it will faile + +### run +then each time you want to launch the app +``` +make up +``` +Be aware that a first up, since the db is empty, it will be populated with your file db.sql. It may take some time depending of your db size. + +## Drupal Composer install +Only at first up, finish to install drupal composer dependencies +but first we need to downgrade composer to version 1 +``` +docker exec -u 0 -it caravane_api_1 /bin/bash +composer selfupdate --1 +``` +ctrl+d +``` +make exec_api +composer install +``` + +## Visualize +You can now visit : +the app http://dev.caravane.fr +or the api http://dev.caravane.fr/api +on your browser + +## Coding +### drush +you can access to drush by loging into the php container +``` +make exec_api +``` +once inside the php container in /var/www/html you can use drush as usual + + +## Updating code + +``` +git pull figli master +# then update all submodules +git submodule update --recursive --checkout +# or only one +git submodule update --checkout app/ +# or +git submodule update --checkout api/ +make api_maj_config +``` + +## Updating manualy mysql db +copy your db backup into the mysql container +```sh +sudo docker cp your-db-file.sql caravane_mysql_1:/root/ +``` +log into mysql container +```sh +make exec_mysql +``` +once inside the mysql container you can use mysql command to drop then create and load the db with your file +``` +mysql -uroot -pcaravane +> drop database caravane; +> create database caravane; +> exit; +mysql -uroot -pcaravane caravane < your-db-file.sql +``` + + +## Makefile + +DO NOT use directly docker or docker-compose to run this instance +use make instead like ```make up``` + +```makefile +pull: + docker-compose pull + +build: + docker-compose build --build-arg USER_UID=$(USER_UID) --build-arg USER_UNAME=$(USER_UNAME) --build-arg USER_GID=$(USER_GID) --build-arg USER_GNAME=$(USER_GNAME) + +buildnc: + docker-compose build --no-cache --build-arg USER_UID=$(USER_UID) --build-arg USER_UNAME=$(USER_UNAME) --build-arg USER_GID=$(USER_GID) --build-arg USER_GNAME=$(USER_GNAME) + +downbuildup: down build up + +up: + docker-compose up -d + +ps: + docker-compose ps + +logs: + docker-compose logs -f + +api_maj_config: api_crd api_composer_install api_updb api_cim api_cr + +api_crd: + docker exec caravane_api_1 /bin/bash -c "drush cache-clear drush" + +api_cr: + docker exec caravane_api_1 /bin/bash -c "drush cr" + +api_updb: + docker exec caravane_api_1 /bin/bash -c "drush updb -y" + +api_cim: + docker exec caravane_api_1 /bin/bash -c "drush config-import -y" + +api_composer_install: + docker exec caravane_api_1 /bin/bash -c "composer install --no-dev" + +down: + docker-compose down + +exec_api: + docker exec -it caravane_api_1 bash + +exec_app: + docker exec -it caravane_app_1 sh + +restart_app: + docker-compose restart app + +exec_mysql: + docker exec -it caravane_mysql_1 bash +``` diff --git a/bin/dumpsql.sh b/bin/dumpsql.sh new file mode 100755 index 0000000..03d1c55 --- /dev/null +++ b/bin/dumpsql.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +DATE=`date '+%Y-%m-%d_%H%M%S'` +#SCRIPT_D=dirname $0 + +#export $(cat ${SCRIPT_D}/../.env | grep -v ^# | xargs) + +docker exec ouatterrir-mysql-1 sh -c 'exec mysqldump -uroot -p"$MYSQL_ROOT_PASSWORD" ouatterrir' > "./ressources/ouatterrir-${DATE}-local.sql" diff --git a/bin/syncfiles.sh b/bin/syncfiles.sh new file mode 100755 index 0000000..f5ebb61 --- /dev/null +++ b/bin/syncfiles.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +rsync --delete -ruv CT-ouatterrir:www/ouatterrir.figli.io/app/src/web/sites/default/files/ ./api/src/web/sites/default/files/ --exclude=js/* --exclude=php/* --exclude=styles/* --exclude=css/* diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..a14de58 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,107 @@ +version: "3.8" + +services: + mysql: + image: mariadb:latest + volumes: + - db-data:/var/lib/mysql + - ./Docker/mysql/mysql.cnf:/etc/mysql/conf.d/custom.cnf:ro + - ./Docker/mysql/bashrc:/root/.bashrc:ro + - "${DB_IMPORTE_FILE}:/docker-entrypoint-initdb.d/caravane.sql" + networks: + - database + hostname: mysql + environment: + MYSQL_ROOT_PASSWORD: "${DB_ROOT_PASSWORD}" + MYSQL_DATABASE: "${DB_NAME}" + MYSQL_USER: "${DB_USERNAME}" + MYSQL_PASSWORD: "${DB_PASSWORD}" + + redis: + image: redis:4 + command: ["redis-server", "--appendonly", "yes"] + volumes: + - redis-data:/data + networks: + - redis + ports: + - "6389" + + phpmyadmin: + image: phpmyadmin/phpmyadmin + ports: + - 8991:80 + networks: + - database + depends_on: + - mysql + environment: + PMA_HOSTS: mysql + + api: + build: ./Docker/api/ + expose: + - 9000 + - 9001 + user: ${USER_UID}:${USER_GID} + volumes: + - php-user-data:/home/${USER_UNAME} + - "${API_ROOT}:/var/www/html/api" + - "${LOG_ROOT}/php:/var/log:rw" + - "${XDEBUG_INI}:/usr/local/etc/php/conf.d/xdebug.ini" + working_dir: "/var/www/html/api/src" + networks: + - database + - redis + - server + # for xdebug + # https://github.com/docker/for-linux/issues/264#issuecomment-965465879 + extra_hosts: + - host.docker.internal:host-gateway + depends_on: + - mysql + - redis + + app: + build: ./Docker/app + user: ${USER_UID}:${USER_GID} + volumes: + - "${APP_ROOT}:/app" + - npm-user-data:/home/${USER_UNAME} + networks: + - app + - server + ports: + - 5173:3000 + working_dir: "/app" + environment: + - APP_ENV=dev + tty: true + + nginx: + build: ./Docker/nginx/ + ports: + - 8990:80 + volumes: + - "${API_ROOT}:/var/www/html/api" + - "${APP_ROOT}:/var/www/html/app" + - "${LOG_ROOT}:/var/log:rw" + working_dir: "/var/www/html/api/" + networks: + - server + depends_on: + - api + - app + # command: [nginx-debug, '-g', 'daemon off;'] + +volumes: + php-user-data: + db-data: + redis-data: + npm-user-data: + +networks: + database: + redis: + server: + app: diff --git a/ressources/xdebug.ini b/ressources/xdebug.ini new file mode 100644 index 0000000..13dcc8a --- /dev/null +++ b/ressources/xdebug.ini @@ -0,0 +1,50 @@ +[xdebug] +; xdebug.remote_enable=1 +xdebug.mode=debug + +;Should use host.docker.internal but not working on linux +; xdebug.remote_host=172.20.0.1 +; Replaced by xdebug.client_host. +xdebug.client_host=host.docker.internal + + +;Not working on docker context +; xdebug.remote_connect_back=0 +; Replaced by xdebug.discover_client_host. +xdebug.discover_client_host=0 + + +;9000 is already bound by php-fpm +; xdebug.remote_port=9001 +; xdebug.remote_port # +; Replaced by xdebug.client_port. +; The default value has also changed from 9000 to 9003. +xdebug.client_port=9001 + +xdebug.remote_handler=dbgp + +; xdebug.remote_mode=req +; xdebug.remote_mode # +; For the req value (the original default), use xdebug.mode=debug with xdebug.start_with_request=trigger. If the original xdebug.remote_autostart behaviour is necessary, use xdebug.start_with_request=yes instead of trigger. + +; For the jit value, use xdebug.mode=debug and xdebug.start_upon_error=yes. + + +; xdebug.remote_autostart=true +; Use xdebug.mode=debug with xdebug.start_with_request=yes +xdebug.start_with_request=yes + +; ?=XDEBUG_SESSION_START=1 +;Log file is mounted on volume so you can follow it +; xdebug.remote_log=/var/log/xdebug-error.log +; Replaced by xdebug.log, which also includes log messages beyond Step Debugging. +xdebug.log=/var/log/xdebug-error.log + +; xdebug.profiler_enable=0 +; xdebug.profiler_enable_trigger=1 +; Use xdebug.mode=profile with xdebug.start_with_request=trigger. +xdebug.profiler_output_name = cachegrind.out.%t.%R +xdebug.output_dir=/var/log/ +; Use the generic xdebug.output_dir setting. + +; Example: http://localhost:8080/test?XDEBUG_PROFILE=1