Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
laradock
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kerwin
laradock
Commits
8d410e9c
Commit
8d410e9c
authored
Nov 23, 2017
by
牟勇
Browse files
Options
Browse Files
Download
Plain Diff
merge upstream
parents
a99281cd
9b8d4806
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
38 additions
and
21 deletions
+38
-21
drawer.html
...ON/themes/hugo-material-docs/layouts/partials/drawer.html
+1
-0
header.html
...ON/themes/hugo-material-docs/layouts/partials/header.html
+0
-1
highlight.css
...-material-docs/static/stylesheets/highlight/highlight.css
+11
-3
Dockerfile
caddy/Dockerfile
+6
-8
docker-compose.dev.yml
docker-compose.dev.yml
+9
-0
docker-compose.yml
docker-compose.yml
+0
-2
env-example
env-example
+8
-1
sync.sh
sync.sh
+1
-1
Dockerfile-71
workspace/Dockerfile-71
+2
-5
No files found.
DOCUMENTATION/themes/hugo-material-docs/layouts/partials/drawer.html
View file @
8d410e9c
...
...
@@ -5,6 +5,7 @@
<div
class=
"logo"
>
<img
src=
"{{ $.Site.BaseURL }}{{ . }}"
>
</div>
Laradock
{{ end }}
<!--<div class="name">-->
<!--<strong>{{ .Site.Title }} {{ with .Site.Params.version }}<span class="version">{{ . }}</span>{{ end }}</strong>-->
...
...
DOCUMENTATION/themes/hugo-material-docs/layouts/partials/header.html
View file @
8d410e9c
...
...
@@ -21,7 +21,6 @@
<div
class=
"button button-github"
role=
"button"
aria-label=
"GitHub"
>
<a
style=
"padding: 0px; font-size:40px"
href=
"https://github.com/{{ . }}"
title=
"@{{ . }} on GitHub"
target=
"_blank"
class=
"toggle-button icon icon-github"
></a>
</div>
<p
style=
"font-size: 18px; padding: 8px"
>
Github
</p>
{{ end }}
<!-- TODO: disabled until Hugo supports the generation of a content index natively
...
...
DOCUMENTATION/themes/hugo-material-docs/static/stylesheets/highlight/highlight.css
View file @
8d410e9c
...
...
@@ -108,9 +108,17 @@ font-weight:700;
OVERRIDING THE DEFAULT STYLES - By Mahmoud Zalt (mahmoud@zalt.me) for Laradock.io
*/
.project
.logo
img
{
width
:
140px
;
height
:
140px
;
.project
.logo
img
{
max-width
:
100%
;
height
:
auto
;
background
:
transparent
;
border-radius
:
0%
;
}
.project
.banner
{
display
:
flex
;
align-items
:
center
;
font-size
:
14px
;
font-weight
:
bold
;
}
\ No newline at end of file
caddy/Dockerfile
View file @
8d410e9c
FROM
golang
FROM
zuohuadong/caddy:alpine
MAINTAINER
Huadong Zuo <admin@zuohuadong.cn>
ARG
plugins="
git
"
ARG
plugins="
cors
"
##
If you come frome china, please ues it.
##
ARG plugins="cors cgi cloudflare azure linode"
# RUN echo "172.217.6.127 golang.org" >> /etc/hosts
RUN
go get github.com/abiosoft/caddyplug/caddyplug
\
&&
caddyplug install-caddy
\
&&
caddyplug
install
git
RUN
caddy
--version
RUN
caddyplug
install
${
plugins
}
EXPOSE
80 443 2015
...
...
docker-compose.dev.yml
0 → 100644
View file @
8d410e9c
version
:
"
2"
services
:
### Applications Code Container #############################
applications
:
volumes
:
-
${APPLICATION}:/var/www
docker-compose.yml
View file @
8d410e9c
...
...
@@ -6,8 +6,6 @@ services:
applications
:
image
:
tianon/true
volumes
:
-
${APPLICATION}:/var/www
### Workspace Utilities Container ###########################
...
...
env-example
View file @
8d410e9c
...
...
@@ -7,6 +7,14 @@
CHANGE_SOURCE=false
### Docker compose files ###############################################################################################
# Select which docker-compose files to include.
COMPOSE_FILE=docker-compose.yml:docker-compose.dev.yml
# Replace the above with the following line if you wish to use docker-sync.
# COMPOSE_FILE=docker-compose.yml:docker-compose.dev.yml:docker-compose.sync.yml
### Application Path ###################################################################################################
# Point to your code, will be available at `/var/www`.
...
...
@@ -100,7 +108,6 @@ PHP_FPM_INSTALL_EXIF=false
PHP_FPM_INSTALL_AEROSPIKE=false
PHP_FPM_INSTALL_MYSQLI=false
PHP_FPM_INSTALL_PGSQL=false
PHP_FPM_INSTALL_POSTGRES=false
PHP_FPM_INSTALL_TOKENIZER=false
PHP_FPM_INSTALL_INTL=false
PHP_FPM_INSTALL_GHOSTSCRIPT=false
...
...
sync.sh
View file @
8d410e9c
...
...
@@ -59,7 +59,7 @@ if [ "$1" == "up" ] ; then
print_style
"Initializing Docker Compose
\n
"
"info"
shift
# removing first argument
docker-compose
-f
docker-compose.yml
-f
docker-compose.sync.yml
up
-d
${
@
}
docker-compose up
-d
${
@
}
elif
[
"
$1
"
==
"down"
]
;
then
print_style
"Stopping Docker Compose
\n
"
"info"
...
...
workspace/Dockerfile-71
View file @
8d410e9c
...
...
@@ -54,9 +54,7 @@ ENV PUID ${PUID}
ENV PGID ${PGID}
RUN groupadd -g ${PGID} laradock && \
useradd -u ${PUID} -g laradock -m laradock && \
apt-get update -yqq && \
apt-get install -y python2.7
useradd -u ${PUID} -g laradock -m laradock
#####################################
# SOAP:
...
...
@@ -686,8 +684,7 @@ RUN if [ ${INSTALL_DUSK_DEPS} = true ]; then \
# Clean up
USER root
RUN apt-get clean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
npm config set python /usr/bin/python2.7
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
# Set default work directory
WORKDIR /var/www
Write
Preview
Markdown
is supported
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