diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f83b1b6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +app/ \ No newline at end of file diff --git a/apache/000-default.conf b/apache/000-default.conf new file mode 100644 index 0000000..82e75d3 --- /dev/null +++ b/apache/000-default.conf @@ -0,0 +1,29 @@ + + # The ServerName directive sets the request scheme, hostname and port that + # the server uses to identify itself. This is used when creating + # redirection URLs. In the context of virtual hosts, the ServerName + # specifies what hostname must appear in the request's Host: header to + # match this virtual host. For the default virtual host (this file) this + # value is not decisive as it is used as a last resort host regardless. + # However, you must set it for any further virtual host explicitly. + #ServerName www.example.com + + ServerAdmin webmaster@localhost + DocumentRoot /var/www/html/public + + # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, + # error, crit, alert, emerg. + # It is also possible to configure the loglevel for particular + # modules, e.g. + #LogLevel info ssl:warn + + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + + # For most configuration files from conf-available/, which are + # enabled or disabled at a global level, it is possible to + # include a line for only one particular virtual host. For example the + # following line enables the CGI configuration for this host only + # after it has been globally disabled with "a2disconf". + #Include conf-available/serve-cgi-bin.conf + diff --git a/app/index.php b/app/index.php deleted file mode 100644 index 1515fd6..0000000 --- a/app/index.php +++ /dev/null @@ -1,14 +0,0 @@ -getMessage(); - } -*/ \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 573e779..34efcec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ version: '3.7' services: - php-apache-environment: + php-apache: container_name: php-apache build: context: ./php diff --git a/php/000-default.conf b/php/000-default.conf new file mode 100644 index 0000000..82e75d3 --- /dev/null +++ b/php/000-default.conf @@ -0,0 +1,29 @@ + + # The ServerName directive sets the request scheme, hostname and port that + # the server uses to identify itself. This is used when creating + # redirection URLs. In the context of virtual hosts, the ServerName + # specifies what hostname must appear in the request's Host: header to + # match this virtual host. For the default virtual host (this file) this + # value is not decisive as it is used as a last resort host regardless. + # However, you must set it for any further virtual host explicitly. + #ServerName www.example.com + + ServerAdmin webmaster@localhost + DocumentRoot /var/www/html/public + + # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, + # error, crit, alert, emerg. + # It is also possible to configure the loglevel for particular + # modules, e.g. + #LogLevel info ssl:warn + + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + + # For most configuration files from conf-available/, which are + # enabled or disabled at a global level, it is possible to + # include a line for only one particular virtual host. For example the + # following line enables the CGI configuration for this host only + # after it has been globally disabled with "a2disconf". + #Include conf-available/serve-cgi-bin.conf + diff --git a/php/Dockerfile b/php/Dockerfile index d54f4ca..b5dc771 100644 --- a/php/Dockerfile +++ b/php/Dockerfile @@ -1,4 +1,7 @@ FROM php:8.1.22-apache -RUN apt-get update && apt-get install -y libpq-dev && docker-php-ext-install pdo pdo_pgsql + +COPY 000-default.conf /etc/apache2/sites-enabled/ + +RUN apt-get update && apt-get install -y libpq-dev git && docker-php-ext-install pdo pdo_pgsql 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 deleted file mode 100644 index c210091..0000000 Binary files a/postgres/data/base/16384/pg_internal.init and /dev/null differ diff --git a/postgres/data/base/5/pg_internal.init b/postgres/data/base/5/pg_internal.init deleted file mode 100644 index 7449a23..0000000 Binary files a/postgres/data/base/5/pg_internal.init and /dev/null differ diff --git a/postgres/data/global/pg_control b/postgres/data/global/pg_control index 20fa61e..c4abb08 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 deleted file mode 100644 index 82a870d..0000000 Binary files a/postgres/data/global/pg_internal.init and /dev/null differ diff --git a/postgres/data/pg_stat/pgstat.stat b/postgres/data/pg_stat/pgstat.stat deleted file mode 100644 index 65a8df9..0000000 Binary files a/postgres/data/pg_stat/pgstat.stat and /dev/null differ diff --git a/postgres/data/pg_wal/000000010000000000000001 b/postgres/data/pg_wal/000000010000000000000001 index c24e05d..7fcfd37 100644 Binary files a/postgres/data/pg_wal/000000010000000000000001 and b/postgres/data/pg_wal/000000010000000000000001 differ diff --git a/postgres/data/postmaster.pid b/postgres/data/postmaster.pid new file mode 100644 index 0000000..27cb006 --- /dev/null +++ b/postgres/data/postmaster.pid @@ -0,0 +1,8 @@ +1 +/var/lib/postgresql/data +1691675843 +5432 +/var/run/postgresql +* + 13817279 0 +ready