mirror of
https://github.com/the-programmers-hangout/Hermes.git
synced 2026-09-04 01:06:00 +02:00
docker updates for web
This commit is contained in:
@@ -0,0 +1,21 @@
|
||||
# Git
|
||||
.git
|
||||
.gitignore
|
||||
.github
|
||||
|
||||
# Local environment and editor files
|
||||
.env
|
||||
.env.*
|
||||
.vscode
|
||||
.idea
|
||||
|
||||
# Build and runtime artifacts
|
||||
vendor
|
||||
builds
|
||||
.laracord
|
||||
storage/logs
|
||||
*.sqlite
|
||||
|
||||
# OS noise
|
||||
.DS_Store
|
||||
Thumbs.db
|
||||
+38
-7
@@ -1,6 +1,15 @@
|
||||
FROM composer:2-php8.4 AS builder
|
||||
|
||||
FROM php:8.4-cli AS builder
|
||||
WORKDIR /build
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
--no-install-recommends \
|
||||
unzip \
|
||||
git \
|
||||
ca-certificates \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
|
||||
|
||||
ENV APP_ENV=development
|
||||
|
||||
COPY composer.json composer.lock* ./
|
||||
@@ -9,12 +18,34 @@ RUN composer install --no-dev --prefer-dist --no-interaction --optimize-autoload
|
||||
COPY . .
|
||||
RUN php laracord app:build \
|
||||
&& mkdir -p /out \
|
||||
&& cp builds/laracord /out/laracord
|
||||
&& cp builds/laracord /out/laracord \
|
||||
&& cp scripts/docker-entrypoint.sh /out/docker-entrypoint.sh
|
||||
|
||||
FROM php:8.4-cli-alpine AS runtime
|
||||
|
||||
WORKDIR /app
|
||||
COPY --from=builder /out/laracord /app/laracord
|
||||
RUN chmod +x /app/laracord
|
||||
RUN apk add --no-cache \
|
||||
libpq \
|
||||
libzip \
|
||||
mysql-client \
|
||||
oniguruma \
|
||||
&& apk add --no-cache --virtual .build-deps \
|
||||
autoconf \
|
||||
gcc \
|
||||
g++ \
|
||||
linux-headers \
|
||||
make \
|
||||
oniguruma-dev \
|
||||
openssl-dev \
|
||||
postgresql-dev \
|
||||
libzip-dev \
|
||||
zlib-dev \
|
||||
&& docker-php-ext-install pdo_pgsql pdo_mysql mbstring sockets zip \
|
||||
&& apk del .build-deps
|
||||
|
||||
CMD ["php", "/app/laracord"]
|
||||
COPY --from=builder /out/laracord /app/laracord
|
||||
COPY --from=builder /out/docker-entrypoint.sh /app/docker-entrypoint.sh
|
||||
RUN chmod +x /app/laracord /app/docker-entrypoint.sh
|
||||
|
||||
EXPOSE 8080
|
||||
|
||||
CMD ["/app/docker-entrypoint.sh"]
|
||||
@@ -16,14 +16,14 @@ class BotServiceProvider extends LaracordServiceProvider
|
||||
parent::boot();
|
||||
|
||||
if (env('APP_ENV') === 'development') {
|
||||
\DB::listen(function ($query) {
|
||||
$sql = $query->sql;
|
||||
$bindings = json_encode($query->bindings);
|
||||
$time = $query->time;
|
||||
$log = '['.date('Y-m-d H:i:s')."] SQL: $sql | Bindings: $bindings | Time: {$time}ms\n";
|
||||
$logPath = storage_path('logs/query.log');
|
||||
file_put_contents($logPath, $log, FILE_APPEND);
|
||||
});
|
||||
// \DB::listen(function ($query) {
|
||||
// $sql = $query->sql;
|
||||
// $bindings = json_encode($query->bindings);
|
||||
// $time = $query->time;
|
||||
// $log = '['.date('Y-m-d H:i:s')."] SQL: $sql | Bindings: $bindings | Time: {$time}ms\n";
|
||||
// $logPath = storage_path('logs/query.log');
|
||||
// file_put_contents($logPath, $log, FILE_APPEND);
|
||||
// });
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
"app",
|
||||
"bootstrap",
|
||||
"config",
|
||||
"resources",
|
||||
"vendor",
|
||||
"database"
|
||||
],
|
||||
@@ -16,4 +17,4 @@
|
||||
"KevinGH\\Box\\Compactor\\Php",
|
||||
"KevinGH\\Box\\Compactor\\Json"
|
||||
]
|
||||
}
|
||||
}
|
||||
+12
-3
@@ -1,9 +1,18 @@
|
||||
services:
|
||||
mimic:
|
||||
hermes:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile
|
||||
container_name: mimic
|
||||
container_name: hermes
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- ./.env:/app/.env:ro
|
||||
- ./.env:/app/.env
|
||||
networks:
|
||||
- db-network
|
||||
- web
|
||||
|
||||
networks:
|
||||
db-network:
|
||||
external: true
|
||||
web:
|
||||
external: true
|
||||
@@ -0,0 +1,4 @@
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
|
||||
exec php -d memory_limit=2048M /app/laracord
|
||||
Reference in New Issue
Block a user