Skip to content

Commit

Permalink
Merge pull request #193 from H2-invent/hotfix/docker_8.2
Browse files Browse the repository at this point in the history
Hotfix/docker 8.2
  • Loading branch information
holema authored Jun 15, 2023
2 parents 929ade6 + 0557d6f commit 0956ef2
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ FROM thecodingmachine/php:8.2-v4-apache-node16
ENV PHP_EXTENSION_LDAP=1
ENV PHP_EXTENSION_INTL=1
ENV TZ=Europe/Berlin
ENV COMPOSER_ALLOW_SUPERUSER=1
USER root
RUN usermod -a -G www-data docker
#Do npm install
Expand All @@ -18,6 +19,7 @@ RUN rm -rf node_modules/
#copy all the rest of the app
COPY . /var/www/html
#install all php dependencies

RUN chown -R docker:docker secretStorage
USER docker
RUN composer install
Expand Down
8 changes: 7 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@ services:
depends_on:
db-odc:
condition: service_healthy
healthcheck:
test: [ "CMD", "curl", "-s", "-f", "-i", "http://localhost:80/health/check" ]
interval: 20s
timeout: 10s
start_period: 30s
retries: 10

environment:
APACHE_DOCUMENT_ROOT: "public/"
Expand Down Expand Up @@ -126,7 +132,7 @@ services:
image: jboss/keycloak:latest

depends_on:
db-odc:
app-odc:
condition: service_healthy

environment:
Expand Down
1 change: 0 additions & 1 deletion src/Controller/HealthCheckController.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ public function index(VorfallRepository $incidentRepository): Response
{
try {
$res = $incidentRepository->findAll();
$vorfall = $res[0]->getFakten();
} catch (Exception $exception) {
throw $this->createNotFoundException('Database not working');
}
Expand Down

0 comments on commit 0956ef2

Please sign in to comment.