From c5fc7cbd316d9ea192cc98cd50024e15c9c4547a Mon Sep 17 00:00:00 2001 From: Dorian HODIN Date: Thu, 24 Nov 2022 22:56:31 +0100 Subject: [PATCH] Dockerfile update --- .drone.yml | 12 ------------ Sources/location_database/phpmyadmin/Dockerfile | 5 ----- Sources/php_script/Dockerfile | 3 +-- 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 Sources/location_database/phpmyadmin/Dockerfile diff --git a/.drone.yml b/.drone.yml index 27d2aeb..c0e2966 100644 --- a/.drone.yml +++ b/.drone.yml @@ -84,15 +84,3 @@ steps: CODEFIRST_CLIENTDRONE_ENV_PASSWORD: from_secret: db_password depends_on: [ php_script ] - -#location-database -- name : database_location - image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest - environment: - phpmyadmin: - IMAGENAME: phpmyadmin:latest - ports: - - 80:80 - environment: - - PMA_ARBITRARY=1 - restart: unless-stopped \ No newline at end of file diff --git a/Sources/location_database/phpmyadmin/Dockerfile b/Sources/location_database/phpmyadmin/Dockerfile deleted file mode 100644 index 30939d7..0000000 --- a/Sources/location_database/phpmyadmin/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM php:8.1-apache -RUN apt-get update && apt-get upgrade -y -RUN docker-php-ext-install mysqli -COPY ./phpmyadmin /var/www/html -EXPOSE 80 \ No newline at end of file diff --git a/Sources/php_script/Dockerfile b/Sources/php_script/Dockerfile index ef430a5..fb9c81d 100644 --- a/Sources/php_script/Dockerfile +++ b/Sources/php_script/Dockerfile @@ -1,6 +1,5 @@ FROM php:8.1-apache RUN apt-get update && apt-get upgrade -y RUN docker-php-ext-install mysqli -RUN apt-get install phpmyadmin php-mbstring php-zip php-gd php-json php-curl -y -RUN phpenmod mbstring && systemctl restart apache2 +RUN cat /proc/version COPY ./script /var/www/html