From 47978e8772d9ac355c76f6ccd6fc59394bc7c301 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sat, 24 Feb 2018 18:37:57 +0100 Subject: Webpack / Configure webpack, ESLint, Travis, Makefile, npm/yarn and git --- .gitattributes | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to '.gitattributes') diff --git a/.gitattributes b/.gitattributes index b191e227..549777ef 100644 --- a/.gitattributes +++ b/.gitattributes @@ -25,16 +25,17 @@ Dockerfile text *.mo binary # Exclude from Git archives -.editorconfig export-ignore -.gitattributes export-ignore -.github export-ignore -.gitignore export-ignore -.travis.yml export-ignore -doc/**/*.json export-ignore -doc/**/*.md export-ignore -docker/ export-ignore -Doxyfile export-ignore -Makefile export-ignore -mkdocs.yml export-ignore -phpunit.xml export-ignore -tests/ export-ignore +.editorconfig export-ignore +.gitattributes export-ignore +.github export-ignore +.gitignore export-ignore +.travis.yml export-ignore +doc/**/*.json export-ignore +doc/**/*.md export-ignore +docker/ export-ignore +Doxyfile export-ignore +Makefile export-ignore +node_modules/ export-ignore +mkdocs.yml export-ignore +phpunit.xml export-ignore +tests/ export-ignore -- cgit v1.2.3 From 03b483aa45ca994c0d75010e2008a8f0bfcf7ed3 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Thu, 10 May 2018 13:29:47 +0200 Subject: Add SASSLint makefile target, and run it in CI Also move ESLint and SASSLint config files to a dedicated .dev folder --- .gitattributes | 1 + 1 file changed, 1 insertion(+) (limited to '.gitattributes') diff --git a/.gitattributes b/.gitattributes index 549777ef..6b6ffbd5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -26,6 +26,7 @@ Dockerfile text # Exclude from Git archives .editorconfig export-ignore +.dev export-ignore .gitattributes export-ignore .github export-ignore .gitignore export-ignore -- cgit v1.2.3 From 2a3fe990dd0730fce9465bbef6ad1a01054f775d Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Sun, 17 Jun 2018 01:02:50 +0200 Subject: docker: build the images from the local sources Relates to https://github.com/shaarli/Shaarli/issues/1153 Signed-off-by: VirtualTam --- .gitattributes | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to '.gitattributes') diff --git a/.gitattributes b/.gitattributes index 6b6ffbd5..9d22f11b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -33,7 +33,9 @@ Dockerfile text .travis.yml export-ignore doc/**/*.json export-ignore doc/**/*.md export-ignore -docker/ export-ignore +.docker/ export-ignore +.dockerignore export-ignore +Dockerfile* export-ignore Doxyfile export-ignore Makefile export-ignore node_modules/ export-ignore -- cgit v1.2.3 From 81c801300b2912dc19a24314629ee550b1899d34 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Wed, 27 Jun 2018 01:20:22 +0200 Subject: Provide a Docker Compose example Closes https://github.com/shaarli/Shaarli/issues/1010 See: - https://hub.docker.com/_/traefik/ - https://docs.traefik.io/configuration/backends/docker/ - https://docs.traefik.io/user-guide/docker-and-lets-encrypt/ - https://github.com/containous/traefik/pull/2798 - https://github.com/containous/traefik/issues/3298 Signed-off-by: VirtualTam --- .gitattributes | 1 + 1 file changed, 1 insertion(+) (limited to '.gitattributes') diff --git a/.gitattributes b/.gitattributes index 9d22f11b..9a92bc37 100644 --- a/.gitattributes +++ b/.gitattributes @@ -35,6 +35,7 @@ doc/**/*.json export-ignore doc/**/*.md export-ignore .docker/ export-ignore .dockerignore export-ignore +docker-compose.* export-ignore Dockerfile* export-ignore Doxyfile export-ignore Makefile export-ignore -- cgit v1.2.3