Skip to content

Commit b2ad39b

Browse files
authored
Merge pull request #6 from js-jslog/use-yeoman-generators-rather-than-templates
Replace tdd template with a Yeoman Generator
2 parents bd83eaf + 47a3311 commit b2ad39b

22 files changed

+24
-15450
lines changed

.gitmodules

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,15 @@
55
path = yeoman-generators/generator-tdd
66
url = [email protected]:js-jslog/generator-tdd.git
77
branch = master
8+
[submodule "yeoman-generators/generator-webpack"]
9+
path = yeoman-generators/generator-webpack
10+
url = [email protected]:js-jslog/generator-webpack.git
11+
branch = master
12+
[submodule "yeoman-generators/generator-express"]
13+
path = yeoman-generators/generator-express
14+
url = [email protected]:js-jslog/generator-express-app.git
15+
branch = master
16+
[submodule "yeoman-generators/generator-dotfiles"]
17+
path = yeoman-generators/generator-dotfiles
18+
url = [email protected]:js-jslog/generator-dotfiles.git
19+
branch = master

Dockerfile

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -103,20 +103,14 @@ COPY --chown=developer:developer dotfiles/.eslintrc.json /home/developer/eslintr
103103
COPY --chown=developer:developer dotfiles/jest.config.js /home/developer/jest.config.js
104104
RUN source ~/.bashrc
105105

106-
# Copy project templates with local dotfiles
107-
COPY --chown=developer:developer templates/tdd/ /home/developer/templates/tdd/
108-
COPY --chown=developer:developer dotfiles/jest.config.js /home/developer/templates/tdd/.
109-
COPY --chown=developer:developer dotfiles/.gitignore /home/developer/templates/tdd/.
110-
COPY --chown=developer:developer dotfiles/.eslintrc.json /home/developer/templates/tdd/.
111-
112-
COPY --chown=developer:developer templates/express-app/ /home/developer/templates/express-app/
113-
COPY --chown=developer:developer dotfiles/.gitignore /home/developer/templates/express-app/.
114-
COPY --chown=developer:developer dotfiles/.eslintrc.json /home/developer/templates/express-app/.
115-
116-
COPY --chown=developer:developer templates/webpack-es6/ /home/developer/templates/webpack-es6/
117-
COPY --chown=developer:developer dotfiles/.gitignore /home/developer/templates/webpack-es6/.
118-
COPY --chown=developer:developer dotfiles/.eslintrc.json /home/developer/templates/webpack-es6/.
119-
106+
# Prepare Yeoman Generators folders
107+
COPY --chown=developer:developer yeoman-generators /home/developer/yeoman-generators
108+
109+
# npm link the Yeoman Generators so that they can be used as though a global module
110+
RUN cd /home/developer/yeoman-generators/generator-dotfiles && npm link
111+
RUN cd /home/developer/yeoman-generators/generator-tdd && npm link
112+
RUN cd /home/developer/yeoman-generators/generator-webpack && npm link
113+
RUN cd /home/developer/yeoman-generators/generator-express && npm link
120114

121115
ARG SEMVER="2.2.1"
122116
LABEL runcommand="docker run --rm -ti -v /var/run/docker.sock:/var/run/docker.sock -p 3000:3000 -e http_proxy -e https_proxy -e HTTP_PROXY -e HTTPS_PROXY -e SSH_AUTH_SOCK=\$SSH_AUTH_SOCK -v $(dirname \$SSH_AUTH_SOCK):$(dirname \$SSH_AUTH_SOCK) -v $(pwd):/home/developer/workspace -w /home/developer/workspace jslog/development-env:$SEMVER"

templates/babel-es6/.babelrc

Lines changed: 0 additions & 4 deletions
This file was deleted.

templates/babel-es6/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)