Fix bug introduced by moving code around.
This commit is contained in:
parent
42a944e0cb
commit
40d816494b
7 changed files with 6 additions and 18 deletions
4
.github/workflows/bouncer.yml
vendored
4
.github/workflows/bouncer.yml
vendored
|
@ -90,8 +90,8 @@ jobs:
|
|||
BUILD_DATE=${{ steps.date.outputs.container_build_datetime }}
|
||||
GIT_COMMIT_MESSAGE=${{ github.event.head_commit.message }}
|
||||
tags: |
|
||||
${{ !env.ACT && 'benzine/bouncer:latest' || '' }}
|
||||
${{ !env.ACT && 'ghcr.io/benzine-framework/bouncer:latest' || 'ghcr.io/benzine-framework/bouncer:devel' }}
|
||||
benzine/bouncer:latest
|
||||
ghcr.io/benzine-framework/bouncer:latest
|
||||
cache-from: ${{ !env.ACT && 'type=gha' || '' }}
|
||||
cache-to: ${{ !env.ACT && 'type=gha,mode=max' || '' }}
|
||||
build-contexts: |
|
||||
|
|
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1,6 +1,5 @@
|
|||
.idea
|
||||
/docker-compose.override.yml
|
||||
/vendor
|
||||
/.php-cs-fixer.cache
|
||||
/.github/cache
|
||||
/.secrets
|
|
@ -94,7 +94,7 @@ EXPOSE 443
|
|||
HEALTHCHECK --start-period=30s \
|
||||
CMD curl -s -o /dev/null -w "200" http://localhost:80/ || exit 1
|
||||
|
||||
RUN printenv | sort
|
||||
RUN ls -lah /app /app/bin
|
||||
|
||||
# checkov:skip=CKV_DOCKER_3 user cannot be determined at this stage.
|
||||
FROM php:nginx as test-app-a
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
<?php
|
||||
|
||||
use Bouncer\Bouncer;
|
||||
define("APP_ROOT", realpath(__DIR__ . "/bouncer"));
|
||||
define("APP_ROOT", realpath(__DIR__ . "/../"));
|
||||
require_once APP_ROOT . '/vendor/autoload.php';
|
||||
|
||||
(new Bouncer())->run();
|
||||
|
|
|
@ -1,7 +0,0 @@
|
|||
version: "2.4"
|
||||
services:
|
||||
bouncer:
|
||||
build:
|
||||
context: bouncer
|
||||
target: bouncer
|
||||
image: ghcr.io/benzine-framework/bouncer:latest
|
|
@ -1,10 +1,7 @@
|
|||
version: "3.5"
|
||||
|
||||
services:
|
||||
bouncer:
|
||||
image: ghcr.io/benzine-framework/bouncer:devel
|
||||
image: ghcr.io/benzine-framework/bouncer:latest
|
||||
build:
|
||||
context: bouncer
|
||||
target: bouncer
|
||||
additional_contexts:
|
||||
- php:cli=docker-image://ghcr.io/benzine-framework/php:cli-8.2
|
||||
|
@ -26,7 +23,6 @@ services:
|
|||
web-a:
|
||||
image: test-app-a
|
||||
build:
|
||||
context: bouncer
|
||||
target: test-app-a
|
||||
additional_contexts:
|
||||
- php:nginx=docker-image://ghcr.io/benzine-framework/php:nginx-8.2
|
||||
|
@ -40,7 +36,6 @@ services:
|
|||
web-b:
|
||||
image: test-app-b
|
||||
build:
|
||||
context: bouncer
|
||||
target: test-app-b
|
||||
additional_contexts:
|
||||
- php:nginx=docker-image://ghcr.io/benzine-framework/php:nginx-8.2
|
||||
|
|
1
vendor/.gitignore
vendored
Normal file
1
vendor/.gitignore
vendored
Normal file
|
@ -0,0 +1 @@
|
|||
*
|
Loading…
Reference in a new issue