Merge branch 'API' of https://codefirst.iut.uca.fr/git/ConsEcoTeam/ConsEco into API
continuous-integration/drone/push Build is passing Details

merge
pull/130/head
Vincent ASTOLFI 2 years ago
commit 4a255191ac

@ -60,7 +60,7 @@ steps:
from_secret: db_user from_secret: db_user
CODEFIRST_CLIENTDRONE_ENV_MARIADB_PASSWORD: CODEFIRST_CLIENTDRONE_ENV_MARIADB_PASSWORD:
from_secret: db_password from_secret: db_password
- name: web-API - name: web-API
image: plugins/docker image: plugins/docker
settings: settings:
@ -73,6 +73,7 @@ steps:
password: password:
from_secret: secret-registry-password from_secret: secret-registry-password
- name: deploy-web-container - name: deploy-web-container
image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest
environment: environment:
@ -88,6 +89,4 @@ steps:
from_secret: db_user from_secret: db_user
CODEFIRST_CLIENTDRONE_ENV_MARIADB_PASSWORD: CODEFIRST_CLIENTDRONE_ENV_MARIADB_PASSWORD:
from_secret: db_password from_secret: db_password
depends_on: [ web-API, deploy-container-mysql ]
depends_on: [ web-API, deploy-container-mysql ]

@ -1,3 +1,6 @@
FROM php:8.1-apache FROM php:8.1-apache
RUN apt-get update && apt-get install -y mariadb-client
RUN docker-php-ext-install mysqli pdo pdo_mysql && docker-php-ext-enable pdo_mysql RUN docker-php-ext-install mysqli pdo pdo_mysql && docker-php-ext-enable pdo_mysql
COPY ./Sources/API /var/www/html/ COPY ./Sources/API /var/www/html/
COPY ./Sources/Data /sql/
RUN cd /sql/

Loading…
Cancel
Save