From 40d816494b5a0054e98226353c39e45bdb896e86 Mon Sep 17 00:00:00 2001
From: Matthew Baggett <matthew@baggett.me>
Date: Sat, 18 May 2024 10:41:43 +0200
Subject: [PATCH] Fix bug introduced by moving code around.
---
.github/workflows/bouncer.yml | 4 ++--
.gitignore | 1 -
Dockerfile | 2 +-
bin/bouncer | 2 +-
build-compose.yml | 7 -------
docker-compose.yml | 7 +------
vendor/.gitignore | 1 +
7 files changed, 6 insertions(+), 18 deletions(-)
delete mode 100644 build-compose.yml
create mode 100644 vendor/.gitignore
diff --git a/.github/workflows/bouncer.yml b/.github/workflows/bouncer.yml
index fbcdb45..9b10463 100644
--- a/.github/workflows/bouncer.yml
+++ b/.github/workflows/bouncer.yml
@@ -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: |
diff --git a/.gitignore b/.gitignore
index b437815..f6c586b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
.idea
/docker-compose.override.yml
-/vendor
/.php-cs-fixer.cache
/.github/cache
/.secrets
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 4375504..56444f9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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
diff --git a/bin/bouncer b/bin/bouncer
index ab877af..9ba99ed 100755
--- a/bin/bouncer
+++ b/bin/bouncer
@@ -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();
diff --git a/build-compose.yml b/build-compose.yml
deleted file mode 100644
index 88e49ed..0000000
--- a/build-compose.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-version: "2.4"
-services:
- bouncer:
- build:
- context: bouncer
- target: bouncer
- image: ghcr.io/benzine-framework/bouncer:latest
diff --git a/docker-compose.yml b/docker-compose.yml
index 3eab9d2..5a51398 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -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
diff --git a/vendor/.gitignore b/vendor/.gitignore
new file mode 100644
index 0000000..f59ec20
--- /dev/null
+++ b/vendor/.gitignore
@@ -0,0 +1 @@
+*
\ No newline at end of file