Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MetaGer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open-source
MetaGer
Commits
40a99324
Commit
40a99324
authored
6 years ago
by
Phil Höfer
Browse files
Options
Downloads
Patches
Plain Diff
Fix database error when using Docker
parent
c068cd50
No related branches found
Branches containing commit
No related tags found
1 merge request
!1310
Resolve "MetaGer in Docker"
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.env.example
+0
-7
0 additions, 7 deletions
.env.example
Dockerfile
+2
-1
2 additions, 1 deletion
Dockerfile
resources/views/index.blade.php
+7
-5
7 additions, 5 deletions
resources/views/index.blade.php
with
9 additions
and
13 deletions
.env.example
+
0
−
7
View file @
40a99324
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Dockerfile
+
2
−
1
View file @
40a99324
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
resources/views/index.blade.php
+
7
−
5
View file @
40a99324
...
...
@@ -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
>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment