Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
open-source
MetaGer
Commits
d2c91461
Commit
d2c91461
authored
Sep 21, 2018
by
Phil Höfer
Browse files
Fix database error when using Docker
parent
2ced0b6e
Changes
3
Hide whitespace changes
Inline
Side-by-side
.env.example
View file @
d2c91461
...
...
@@ -4,13 +4,6 @@ APP_LOG_LEVEL=debug
APP_KEY=
APP_URL=http://localhost
DB_CONNECTION=mysql
DB_HOST=127.0.0.1
DB_PORT=3306
DB_DATABASE=homestead
DB_USERNAME=homestead
DB_PASSWORD=secret
BROADCAST_DRIVER=log
CACHE_DRIVER=file
SESSION_DRIVER=file
...
...
Dockerfile
View file @
d2c91461
...
...
@@ -14,13 +14,14 @@ RUN apt-get update && apt-get install -y \
sqlite3
\
nodejs
\
libpng-dev
\
unzip
\
npm
RUN
npm
install
gulp
-g
COPY
. /app
WORKDIR
app
RUN
mv
config/sumas.xml.example config/sumas.xml
&&
mv
.env.example .env
RUN
composer
install
RUN
composer
install
--no-plugins
--no-scripts
RUN
npm
install
RUN
npm run dev
...
...
resources/views/index.blade.php
View file @
d2c91461
...
...
@@ -25,11 +25,13 @@
<
div
id
=
"sponsors"
>
<
h2
>
{{
trans
(
'index.sponsors.head.2'
)
}}
</
h2
>
<
ul
class
=
"startpage"
>
@
foreach
(
DB
::
table
(
'sponsorenlinks'
)
->
where
(
'langcode'
,
'de'
)
->
orderByRaw
(
'LENGTH(linktext)'
,
'ASC'
)
->
get
()
as
$link
)
<
li
class
=
"sponsor"
>
<
a
href
=
"{{
$link->link
}}"
target
=
"_blank"
rel
=
"noopener"
><
p
>
{{
$link
->
linktext
}}
</
p
>
<
i
class
=
"fa fa-external-link"
></
i
></
a
>
</
li
>
@
endforeach
@
if
(
getenv
(
'DB_CONNECTION'
)
===
'mysql'
)
@
foreach
(
DB
::
table
(
'sponsorenlinks'
)
->
where
(
'langcode'
,
'de'
)
->
orderByRaw
(
'LENGTH(linktext)'
,
'ASC'
)
->
get
()
as
$link
)
<
li
class
=
"sponsor"
>
<
a
href
=
"{{
$link->link
}}"
target
=
"_blank"
rel
=
"noopener"
><
p
>
{{
$link
->
linktext
}}
</
p
>
<
i
class
=
"fa fa-external-link"
></
i
></
a
>
</
li
>
@
endforeach
@
endif
</
ul
>
</
div
>
</
div
>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment