From 7e920366e4e01b09a166a1c28f7eeb3d7947c04b Mon Sep 17 00:00:00 2001 From: Fatih Alp Date: Mon, 26 Jun 2023 17:25:00 +0000 Subject: [PATCH] Add GD --- docker-compose.yml | 5 ++++- docker/php/Dockerfile | 7 +++++++ install.sh | 18 +++--------------- uninstall.sh | 8 +++++++- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ffd9f73dd..8bfc38090 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,7 +36,10 @@ services: - DB_PASSWORD=${DB_PASSWORD:-secret} depends_on: database: - condition: service_healthy + condition: service_healthy + extra_hosts: + - "host.docker.internal:host-gateway" + nginx: build: diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index 6e53a319c..7f4be184e 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -22,6 +22,13 @@ RUN apt-get update \ libzip-dev \ libicu-dev \ libonig-dev \ + libpq-dev \ + libcurl4-gnutls-dev \ + libfreetype6-dev libjpeg62-turbo-dev libpng-dev && \ + docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ && \ + docker-php-ext-install gd + + && apt-get clean \ && rm -rf /var/lib/apt/lists/* \ && locale-gen en_US.UTF-8 \ diff --git a/install.sh b/install.sh index 3378adf5a..ed0db27f8 100644 --- a/install.sh +++ b/install.sh @@ -38,22 +38,10 @@ if [[ $(which docker) && $(docker --version) ]]; then fi fi -cp .env-sail .env - -#docker compose down -v - -#docker compose build - -#--no-cache - -docker compose up - -#--force-recreate - -#docker exec -it oc_php php artisan install --ready -#docker exec -it oc_nginx COPY ./docker/nginx/nginx.conf /etc/nginx/nginx.conf - +cp -u .env-sail .env +docker compose up #php artisan migrate --all-addons --force +#docker exec -it oc_php php artisan install --ready #composer config http-basic.abc.aaa.com openclassify pass #composer config repositories.repo-name composer https://abc.aaa.com diff --git a/uninstall.sh b/uninstall.sh index dc4d79615..4191aff1f 100644 --- a/uninstall.sh +++ b/uninstall.sh @@ -4,4 +4,10 @@ echo "|| ## Openclassify ## || " echo "|| Removing Bye bye || " docker compose down -v -# TODO @fatihalp \ No newline at end of file +# TODO @fatihalp + +# reinstall +docker compose build --no-cache + +docker compose up --force-recreate +