Skip to content

Commit ea46f6f

Browse files
author
Arnaud RITTI
committed
Merge branch 'develop' into main
2 parents b9110f2 + 26a73cc commit ea46f6f

File tree

6 files changed

+88
-11
lines changed

6 files changed

+88
-11
lines changed

.dockerignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ var/cache
1010
var/log
1111
var/data.db
1212

13-
.env
1413
.env.*
1514

1615
public/build

Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ ENV TEMPLATE_PHP_INI "production"
77
ENV PHP_INI_MEMORY_LIMIT="128M"
88

99
ENV PHP_EXTENSIONS="gd pdo_sqlite" \
10-
APACHE_RUN_USER=www-data \
11-
APACHE_RUN_GROUP=www-data \
10+
APACHE_EXTENSIONS="headers" \
1211
APACHE_DOCUMENT_ROOT=public/
1312

1413
RUN composer install --no-progress --no-interaction --optimize-autoloader
@@ -27,12 +26,11 @@ RUN composer clear-cache
2726
RUN rm -rf node_modules
2827

2928
ENV APP_ENV "prod"
30-
ENV APP_DEBUG "0"
31-
ENV APP_SECRET "455159ee27d159bdbdeb8b34e599e80e"
32-
ENV MESSENGER_TRANSPORT_DSN "doctrine://default?auto_setup=0"
3329
ENV BUCKET_MODE "path"
34-
ENV DATABASE_URL "sqlite:///%kernel.project_dir%/var/data.db"
3530
ENV CORS_ALLOW_ORIGIN "^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$"
3631
ENV TRUSTED_PROXIES "127.0.0.1,REMOTE_ADDR"
3732

3833
VOLUME ["var/bins", "var/log"]
34+
35+
ENV CRON_SCHEDULE "*/15 * * * *"
36+
ENV CRON_COMMAND "bin/console schedule:run"

public/.htaccess

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,6 @@ DirectoryIndex index.php
8686
<IfModule mod_rewrite.c>
8787
RewriteEngine On
8888

89-
RewriteCond %{HTTPS} !=on
90-
RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
91-
92-
9389
# Determine the RewriteBase automatically and set it as environment variable.
9490
# If you are using Apache aliases to do mass virtual hosting or installed the
9591
# project in a subdirectory, the base path will be prepended to allow proper
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{% extends 'base.html.twig' %}
2+
3+
{% block content %}
4+
<section class="hero">
5+
<div class="hero__inner">
6+
<h1 data-animate="title" class="text-center uppercase">
7+
Oops :(
8+
</h1>
9+
</div>
10+
</section>
11+
12+
<section class="page-content__wrapper">
13+
<div class="page-content__inner">
14+
<section>
15+
<div class="max-w-3xl">
16+
<div class="mx-auto space-y-16 text-lg text-left">
17+
<div class="space-y-8">
18+
<p class="text-base text-center font-light text-waterloo dark:text-santa md:mt-5">
19+
<b class="inline-block mb-4">THE PAGE YOU WERE LOOKING FOR DOESN'T EXIST.</b><br>
20+
Checkout for any URL misspelling or <a href="/" class="link">return to the homepage</a>.
21+
</p>
22+
</div>
23+
</div>
24+
</div>
25+
</section>
26+
</div>
27+
</section>
28+
{% endblock %}
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{% extends 'base.html.twig' %}
2+
3+
{% block content %}
4+
<section class="hero">
5+
<div class="hero__inner">
6+
<h1 data-animate="title" class="text-center uppercase">
7+
Page not found
8+
</h1>
9+
</div>
10+
</section>
11+
12+
<section class="page-content__wrapper">
13+
<div class="page-content__inner">
14+
<section>
15+
<div class="max-w-3xl">
16+
<div class="mx-auto space-y-16 text-lg text-left">
17+
<div class="space-y-8">
18+
<p class="text-base text-center font-light text-waterloo dark:text-santa md:mt-5">
19+
<b class="inline-block mb-4">THE PAGE YOU WERE LOOKING FOR DOESN'T EXIST.</b><br>
20+
Checkout for any URL misspelling or <a href="/" class="link">return to the homepage</a>.
21+
</p>
22+
</div>
23+
</div>
24+
</div>
25+
</section>
26+
</div>
27+
</section>
28+
{% endblock %}
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{% extends 'base.html.twig' %}
2+
3+
{% block content %}
4+
<section class="hero">
5+
<div class="hero__inner">
6+
<h1 data-animate="title" class="text-center uppercase">
7+
INTERNAL SERVER ERROR
8+
</h1>
9+
</div>
10+
</section>
11+
12+
<section class="page-content__wrapper">
13+
<div class="page-content__inner">
14+
<section>
15+
<div class="max-w-3xl">
16+
<div class="mx-auto space-y-16 text-lg text-left">
17+
<div class="space-y-8">
18+
<p class="text-base text-center font-light text-waterloo dark:text-santa md:mt-5">
19+
<b class="inline-block mb-4">THE PAGE YOU WERE LOOKING FOR DOESN'T EXIST.</b><br>
20+
Checkout for any URL misspelling or <a href="/" class="link">return to the homepage</a>.
21+
</p>
22+
</div>
23+
</div>
24+
</div>
25+
</section>
26+
</div>
27+
</section>
28+
{% endblock %}

0 commit comments

Comments
 (0)