Merge branch 'master' of https://codefirst.iut.uca.fr/git/Assasymfony/Fukashitapi

11 months ago · 3b922ab8f6
parent 70b8bc465f d35a189b0b
commit 3b922ab8f6
6 changed files with 92 additions and 21 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -2,21 +2,48 @@ kind: pipeline
 type: docker
 name: default

-# steps:
-# - name: deploy-db
-#   image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest
-#   environment:
-#       IMAGENAME: mariadb:10
-#       CONTAINERNAME: mysql
-#       COMMAND: create
-#       OVERWRITE: true
-#       PRIVATE: true
-#       CODEFIRST_CLIENTDRONE_ENV_MARIADB_ROOT_PASSWORD:
-#         from_secret: db_root_password        
-#       CODEFIRST_CLIENTDRONE_ENV_MARIADB_DATABASE:
-#         from_secret: db_database
-#       CODEFIRST_CLIENTDRONE_ENV_MARIADB_USER:
-#         from_secret: db_user
-#       CODEFIRST_CLIENTDRONE_ENV_MARIADB_PASSWORD:
-#         from_secret: db_password
-#       ADMINS: dorianhodin,corentinrichard,remiarnal,aurianjault
+trigger:
+  event:
+    - push
+
+steps:
+  - name: deploy-db
+    image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest
+    environment:
+      IMAGENAME: mariadb:10
+      CONTAINERNAME: mysql
+      COMMAND: create
+      OVERWRITE: true
+      #PRIVATE: true
+      CODEFIRST_CLIENTDRONE_ENV_MARIADB_ROOT_PASSWORD:
+        from_secret: db_root_password        
+      CODEFIRST_CLIENTDRONE_ENV_MARIADB_DATABASE:
+        from_secret: db_database
+      CODEFIRST_CLIENTDRONE_ENV_MARIADB_USER:
+        from_secret: db_user
+      CODEFIRST_CLIENTDRONE_ENV_MARIADB_PASSWORD:
+        from_secret: db_password
+      ADMINS: dorianhodin,aurianjault,corentinrichard,remiarnal
+
+
+  - name: create-image
+    image: plugins/docker
+    settings:
+      dockerfile: ./Dockerfile
+      context: .
+      registry: hub.codefirst.iut.uca.fr
+      repo: hub.codefirst.iut.uca.fr/dorian.hodin/fukashitapi
+      username:
+        from_secret: SECRET_USERNAME
+      password:
+        from_secret: SECRET_PASSWD
+
+  - name: deploy-api
+    image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest
+    environment:
+      IMAGENAME: hub.codefirst.iut.uca.fr/dorian.hodin/fukashitapi:latest
+      CONTAINERNAME: fukashitapi
+      COMMAND: create
+      OVERWRITE: true
+      ADMINS: dorianhodin,aurianjault,corentinrichard,remiarnal
+    depends_on: [ create-image ]
--- a/.env
+++ b/.env
@ -32,3 +32,6 @@ DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
 ###> nelmio/cors-bundle ###
 CORS_ALLOW_ORIGIN='^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$'
 ###< nelmio/cors-bundle ###
+
+
+BASE_PATH=/Assassymfony-fukashitapi
--- a/17
+++ b/17
@ -0,0 +1,17 @@
+FROM php:8.2-apache
+
+RUN apt-get update && apt-get install -y git zip
+
+COPY . /var/www/html
+WORKDIR /var/www/html
+
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+RUN composer install
+
+RUN a2enmod rewrite
+RUN a2enmod actions
+
+COPY ./vhost.conf /etc/apache2/sites-available/000-default.conf
+RUN service apache2 restart
+
+ENTRYPOINT ["php","-S","0.0.0.0:80","-t","./public"]
--- a/README.md
+++ b/README.md
@ -4,7 +4,7 @@

 # **Fukashitapi** 
 ### Vos rêves valent le coup d'être diffusé
-![Symfony](https://img.shields.io/badge/symfony-5.3-green)
+![Symfony](https://img.shields.io/badge/symfony-7.0.7-green)
 </div>


@ -126,7 +126,7 @@ classDiagram
 </a>

 <a href = "https://codefirst.iut.uca.fr/git/aurian.jault">
-<img src="https://codefirst.iut.uca.fr/git/avatars/d774f04d13eab2fbcdfcbfccb966108f?size=870" width="50" >
+<img src="https://codefirst.iut.uca.fr/git/avatars/e617cf1cc0d6e769f4dc33604f04525b?size=870" width="50" >
 </a>

 <a href = "https://codefirst.iut.uca.fr/git/remi.arnal">
@ -134,7 +134,9 @@ classDiagram
 </a>

 <a href = "https://codefirst.iut.uca.fr/git/dorian.hodin">
-<img src="https://codefirst.iut.uca.fr/git/avatars/d6f97dbdf66352b0b66685e144aa1ee5?size=870" width="50" >
+<img src="https://codefirst.iut.uca.fr/git/avatars/1987ef0b5b65f4d208cb3250a24b4794?size=870" width="50" >
 </a>

 </div>
+
+</div>
--- a/config/routes.yaml
+++ b/config/routes.yaml
@ -3,3 +3,4 @@ controllers:
        path: ../src/Controller/
        namespace: App\Controller
    type: attribute
+    prefix: /Assassymfony-fukashitapi
--- a/vhost.conf
+++ b/vhost.conf
@ -0,0 +1,21 @@
+<VirtualHost *:80>
+    DocumentRoot /var/www/html/public
+    DirectoryIndex index.php
+
+    <Directory /var/www/html/public>
+        AllowOverride All
+        Order Allow,Deny
+        Allow from All
+        Require all granted
+        FallbackResource /index.php
+    </Directory>
+
+    ErrorLog ${APACHE_LOG_DIR}/error.log
+    CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+    <IfModule mod_rewrite.c>
+        RewriteEngine On
+        RewriteCond %{REQUEST_FILENAME} !-f
+        RewriteRule ^(.*)$ index.php [QSA,L]
+    </IfModule>
+</VirtualHost>