Skip to content

Commit 9c69325

Browse files
committed
Merge branch 'release/v1.0.0'
2 parents fdba57d + 9addf09 commit 9c69325

11 files changed

+41
-4
lines changed

Dockerfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
FROM jekyll/jekyll:latest
2+
3+
RUN gem install bundler jekyll
4+
5+
WORKDIR /www

LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2018 Asociación CoderDojo España
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
# www.coderdojo.es
1+
# Web de www.coderdojo.es
22

3-
> Web colaborativa de la Asociación CoderDojo España.
4-
5-
Si eres ninja, mentor o champion de algún dojo, puedes colaborar en el proyecto añadiendo contenido de últimas noticias, eventos, etc. además de modificar la programación y diseño de la web aportando "tu granito de código".
3+
> Si eres ninja, mentor o champion de algún dojo nacional, puedes colaborar en el proyecto añadiendo nuevos contenidos o aportando tu granito de arena en la programación de la web.
64
75
## Documentación
86

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

docker-compose.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
version: '3'
2+
3+
services:
4+
5+
jekyll:
6+
build: ./
7+
container_name: jekyll
8+
working_dir: /www
9+
command: jekyll serve --watch --force_polling --verbose
10+
volumes:
11+
- .:/www
12+
ports:
13+
- 4000:4000

0 commit comments

Comments
 (0)