more reasonable file names
This commit is contained in:
JAremko
syl20bnr
parent
0ccb160271
commit
21146336c1
|
|
@ -196,9 +196,9 @@ currently unsupported layer or fix/extend existing one.
|
|||
See [[./dockerfiles/spacemacs-docker/usr/local/spacemacs/lib/README.org][lib/README.org]]. Also you can improve libraries, docs.
|
||||
** What's up with the Dockerfile formatting?
|
||||
Docker build logs are ugly anyway. At least we can keep Dockerfiles
|
||||
as readable as possible. Also Emacs-Lisp DSL prints out executed
|
||||
command and its output (if any) so we don't need to dig into usual
|
||||
docker builder's wall of text.
|
||||
as readable as possible. Also Emacs-Lisp build helpers prints out
|
||||
executed command and its output (if any) so we don't need to dig
|
||||
into usual docker builder's wall of text.
|
||||
** Why not use Docker compose?
|
||||
It will make =spacemacs-docker= setup much less "beginner friendly".
|
||||
Currently user's .spacemacs file serves similar role. During the
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ RUN git clone "${GIT_REPO}" -b "${GIT_BRANCH}" "${UHOME}/.emacs.d" && \
|
|||
dockerfiles/spacemacs-docker/usr/local/spacemacs" /usr/local/spacemacs && \
|
||||
emacs -Q -batch -l /usr/local/spacemacs/lib/init.el > /dev/null 2>&1
|
||||
|
||||
SHELL ["/usr/bin/emacs", "-l", "/usr/local/spacemacs/lib/dockerfile-dsl.el", \
|
||||
SHELL ["/usr/bin/emacs", "-l", "/usr/local/spacemacs/lib/build-helpers.el", \
|
||||
"-Q", "-batch", "--eval"]
|
||||
|
||||
# Build and test spacemacs (with all packages downloaded)
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
;;
|
||||
;;; License: GPLv3
|
||||
|
||||
(load "/usr/local/spacemacs/lib/deps-dsl.el" nil t)
|
||||
(load "/usr/local/spacemacs/lib/deps-install-helpers.el" nil t)
|
||||
|
||||
(checkpoint
|
||||
(install default-jre-headless)
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
;;
|
||||
;;; License: GPLv3
|
||||
|
||||
(load "/usr/local/spacemacs/lib/deps-dsl.el" nil t)
|
||||
(load "/usr/local/spacemacs/lib/deps-install-helpers.el" nil t)
|
||||
|
||||
(defconst docsets '(
|
||||
(clojure . ("http://newyork.kapeli.com/feeds/Clojure.tgz"))
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
;;
|
||||
;;; License: GPLv3
|
||||
|
||||
(load "/usr/local/spacemacs/lib/deps-dsl.el" nil t)
|
||||
(load "/usr/local/spacemacs/lib/deps-install-helpers.el" nil t)
|
||||
|
||||
(with-build-dir (tfasd "/tmp/fasd/")
|
||||
(with-installed (make git)
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
;;
|
||||
;;; License: GPLv3
|
||||
|
||||
(load "/usr/local/spacemacs/lib/deps-dsl.el" nil t)
|
||||
(load "/usr/local/spacemacs/lib/deps-install-helpers.el" nil t)
|
||||
|
||||
(checkpoint
|
||||
(let ((go-version "1.7"))
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
;;
|
||||
;;; License: GPLv3
|
||||
|
||||
(load "/usr/local/spacemacs/lib/deps-dsl.el" nil t)
|
||||
(load "/usr/local/spacemacs/lib/deps-install-helpers.el" nil t)
|
||||
|
||||
(checkpoint
|
||||
(let ((global-version "6.5.5"))
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
;;
|
||||
;;; License: GPLv3
|
||||
|
||||
(load "/usr/local/spacemacs/lib/deps-dsl.el" nil t)
|
||||
(load "/usr/local/spacemacs/lib/deps-install-helpers.el" nil t)
|
||||
|
||||
(checkpoint
|
||||
(with-installed (git curl)
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
;;
|
||||
;;; License: GPLv3
|
||||
|
||||
(load "/usr/local/spacemacs/lib/deps-dsl.el" nil t)
|
||||
(load "/usr/local/spacemacs/lib/deps-install-helpers.el" nil t)
|
||||
|
||||
(checkpoint
|
||||
(with-installed (curl)
|
||||
|
|
|
|||
|
|
@ -10,6 +10,6 @@
|
|||
;;
|
||||
;;; License: GPLv3
|
||||
|
||||
(load "/usr/local/spacemacs/lib/deps-dsl.el" nil t)
|
||||
(load "/usr/local/spacemacs/lib/deps-install-helpers.el" nil t)
|
||||
|
||||
(install pandoc)
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
;;
|
||||
;;; License: GPLv3
|
||||
|
||||
(load "/usr/local/spacemacs/lib/deps-dsl.el" nil t)
|
||||
(load "/usr/local/spacemacs/lib/deps-install-helpers.el" nil t)
|
||||
|
||||
(checkpoint
|
||||
(install libpng-dev libz-dev libpoppler-glib-dev
|
||||
|
|
|
|||
|
|
@ -10,6 +10,6 @@
|
|||
;;
|
||||
;;; License: GPLv3
|
||||
|
||||
(load "/usr/local/spacemacs/lib/deps-dsl.el" nil t)
|
||||
(load "/usr/local/spacemacs/lib/deps-install-helpers.el" nil t)
|
||||
|
||||
(install ispell)
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ Dependency installation libraries for [[../../../../../../README.org][spacemacs-
|
|||
|
||||
* library list
|
||||
1. [[./init.el][init.el]] - Installs packages used in the libs
|
||||
2. [[./dockerfile-dsl.el][dockerfile-dsl.el]] - Elisp Dockerfile DSL (also used in =deps-dsl.el=)
|
||||
3. [[./deps-dsl.el][deps-dsl.el]] - layers dependencies installation helpers
|
||||
2. [[./build-helpers.el][build-helpers.el]] - Elisp Dockerfile build helpers (also used in =deps-dsl.el=)
|
||||
3. [[./deps-install-helpers.el][deps-install-helpers.el]] - layers dependencies installation helpers
|
||||
[[../deps-installers/README.org][Usage examples]]
|
||||
|
||||
* Workflow
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
;;; dockerfile-dsl.el --- Spacemacs layers dependencies installation DSL File
|
||||
;;; build-helpers.el --- spacemacs-docker Dockerfile build helpers file
|
||||
;;
|
||||
;; Copyright (c) 2012-2016 Sylvain Benner & Contributors
|
||||
;;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
;;; deps-dsl.el --- Spacemacs layers dependencies installation DSL File
|
||||
;;; deps-install-helpers.el --- Spacemacs layers deps. install helpers File
|
||||
;;
|
||||
;; Copyright (c) 2012-2016 Sylvain Benner & Contributors
|
||||
;;
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
;;
|
||||
;;; License: GPLv3
|
||||
|
||||
(load (expand-file-name "dockerfile-dsl.el"
|
||||
(load (expand-file-name "build-helpers.el"
|
||||
(file-name-directory (or load-file-name
|
||||
(buffer-file-name))))
|
||||
nil
|
||||
Loading…
Reference in New Issue