diff --git a/docker-compose.yml b/docker-compose.yml index 1aa7975..573e779 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,10 +1,11 @@ -version: '2' +version: '3.7' services: php-apache-environment: container_name: php-apache build: context: ./php dockerfile: Dockerfile + restart: always depends_on: - db volumes: diff --git a/php/Dockerfile b/php/Dockerfile index d330a09..d54f4ca 100644 --- a/php/Dockerfile +++ b/php/Dockerfile @@ -1,17 +1,4 @@ FROM php:8.1.22-apache RUN apt-get update && apt-get install -y libpq-dev && docker-php-ext-install pdo pdo_pgsql - - - -#FROM php:fpm-alpine -#RUN apk update; \ -# apk upgrade; -#RUN apk add --n0-cache curl git build-base zlib-dev oniguruma-dev autoconf bash - -#COPY --from=composer:latest /usr/bin/composer /usr/bin/composer - - - -#RUN docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql \ -# && docker-php-ext-install pgsql pdo_pgsql \ No newline at end of file +RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer \ No newline at end of file diff --git a/postgres/data/base/16384/pg_internal.init b/postgres/data/base/16384/pg_internal.init index 8d74642..c210091 100644 Binary files a/postgres/data/base/16384/pg_internal.init and b/postgres/data/base/16384/pg_internal.init differ diff --git a/postgres/data/base/5/pg_internal.init b/postgres/data/base/5/pg_internal.init index 9d39444..7449a23 100644 Binary files a/postgres/data/base/5/pg_internal.init and b/postgres/data/base/5/pg_internal.init differ diff --git a/postgres/data/global/pg_control b/postgres/data/global/pg_control index 40a8e09..20fa61e 100644 Binary files a/postgres/data/global/pg_control and b/postgres/data/global/pg_control differ diff --git a/postgres/data/global/pg_internal.init b/postgres/data/global/pg_internal.init index ab3ebe0..82a870d 100644 Binary files a/postgres/data/global/pg_internal.init and b/postgres/data/global/pg_internal.init differ diff --git a/postgres/data/pg_stat/pgstat.stat b/postgres/data/pg_stat/pgstat.stat index 95e2aa2..65a8df9 100644 Binary files a/postgres/data/pg_stat/pgstat.stat and b/postgres/data/pg_stat/pgstat.stat differ diff --git a/postgres/data/pg_wal/000000010000000000000001 b/postgres/data/pg_wal/000000010000000000000001 index 7f54e20..c24e05d 100644 Binary files a/postgres/data/pg_wal/000000010000000000000001 and b/postgres/data/pg_wal/000000010000000000000001 differ