Skip to content

Commit

Permalink
Merge pull request #140 from geotribu/tooling/improvments-summer-2020
Browse files Browse the repository at this point in the history
Tooling/improvements summer 2020
  • Loading branch information
Guts authored Jul 29, 2020
2 parents 3ae554f + 448c7b4 commit 649a29b
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 9 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
**/.dockerignore
**/.env
**/.git
**/.github
**/.gitignore
**/.project
**/.settings
Expand Down
22 changes: 15 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
# FROM python:3.7-slim-buster
FROM python:3.7-alpine3.11
FROM python:3.8.1-alpine3.11

ENV PYTHONDONTWRITEBYTECODE 1
ENV PYTHONUNBUFFERED 1

# Upgrade distrib
RUN apk add --no-cache \
# dependencies for mkdocs-git-revision-date-localized-plugin
git git-fast-import
# Set build directory
WORKDIR /tmp

# Install pip requirements
ADD requirements.txt .
RUN python -m pip install -r requirements.txt --no-cache-dir

# Perform build and cleanup artifacts
RUN \
apk add --no-cache \
git \
git-fast-import \
openssh \
&& apk add --no-cache --virtual .build gcc musl-dev \
&& pip install --no-cache-dir -r requirements.txt \
&& apk del .build gcc musl-dev \
&& rm -rf /tmp/*

# Set working directory
WORKDIR /app
2 changes: 1 addition & 1 deletion docker-compose-mkdocs.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ services:
- 8000:8000
volumes:
- .:/app
command: mkdocs serve -f mkdocs.yml --dev-addr=0.0.0.0:8000
command: mkdocs serve --config-file mkdocs.yml --dirtyreload --dev-addr=0.0.0.0:8000
13 changes: 13 additions & 0 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ plugins:
- minify:
minify_html: true
- rss:
abstract_chars_count: 500
image: "https://cdn.geotribu.fr/img/internal/charte/geotribu_logo_64x64.png"
length: 50
- search:
# prebuild_index: python
Expand All @@ -49,6 +51,8 @@ theme:
- tabs
- instant
font: false
icon:
repo: fontawesome/brands/github-alt
language: 'fr'
logo: 'theme/assets/images/geotribu/logo_geotribu.png'
palette:
Expand All @@ -68,10 +72,19 @@ extra:
social:
- icon: 'fontawesome/brands/github-alt'
link: 'https://github.com/geotribu/'
name: "L'organisation Github de Geotribu"
- icon: 'fontawesome/brands/twitter'
link: 'https://twitter.com/search?q=%23GeoRDP&src=typed_query&f=live'
name: "La #GeoRDP de Geotribu sur Twitter"
- icon: 'fontawesome/brands/facebook'
link: 'https://fr-fr.facebook.com/geotribu/'
name: "Page Facebook de Geotribu"
- icon: fontawesome/solid/paper-plane
link: mailto:<[email protected]>
name: "Nous contacter"
- icon: 'fontawesome/brands/slack'
link: 'https://geotribu.slack.com'
name: "Rejoignez-nous sur Slack"

extra_css:
- 'theme/assets/stylesheets/extra.css'
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ mkdocs-localsearch==0.7.*
mkdocs-material>=5.4,<5.6
mkdocs-minify-plugin==0.3.*
mkdocs-redirects==1.0.*
mkdocs-rss-plugin>=0.3,<0.4
mkdocs-rss-plugin>=0.3,<0.5

0 comments on commit 649a29b

Please sign in to comment.