diff options
| author | Mhd Sulhan <ms@kilabit.info> | 2015-11-20 13:39:38 +0700 |
|---|---|---|
| committer | Mhd Sulhan <ms@kilabit.info> | 2015-11-20 13:39:38 +0700 |
| commit | 6c16d9d41aeb4af6e180df1f81080111cf91f4a1 (patch) | |
| tree | aded461cb028bd669c832efecfc2bf4cf1cb16d9 | |
| parent | 36868465aa7d21736afcb057b2d16f5bfd6436e7 (diff) | |
| download | arch-docker-6c16d9d41aeb4af6e180df1f81080111cf91f4a1.tar.xz | |
arch-base-nodejs: clean rootfs after bootstrapping.
* Remove symlink to test source.
* Backup npm cache.
* init.sh: always run npm install after starting up the container.
| -rwxr-xr-x | arch-base-nodejs/bootstrap_nodejs.sh | 7 | ||||
| -rwxr-xr-x | arch-base-nodejs/init.sh | 8 | ||||
| l--------- | arch-base-nodejs/src | 1 | ||||
| -rwxr-xr-x | arch-base-nodejs/vars.sh | 2 |
4 files changed, 8 insertions, 10 deletions
diff --git a/arch-base-nodejs/bootstrap_nodejs.sh b/arch-base-nodejs/bootstrap_nodejs.sh index 313a4cb..d698f12 100755 --- a/arch-base-nodejs/bootstrap_nodejs.sh +++ b/arch-base-nodejs/bootstrap_nodejs.sh @@ -3,9 +3,4 @@ echo "==> bootstraping nodejs ..." ## cleaning ... -rm -r /usr/share/icu/* -rm -r /usr/lib/node_modules/npm/doc/* -rm -r /usr/lib/node_modules/npm/html/doc/* -rm -r /usr/lib/node_modules/npm/man/* -rm -rf /usr/lib/python2.7/test -rm -rf /usr/share/perl5 +bootstrap_clean_nodejs diff --git a/arch-base-nodejs/init.sh b/arch-base-nodejs/init.sh index a9ab876..08a7fab 100755 --- a/arch-base-nodejs/init.sh +++ b/arch-base-nodejs/init.sh @@ -4,10 +4,12 @@ export WORKDIR=${WORKDIR:-"/srv/www"} export COMMANDS=${COMMANDS:-"npm start"} export NODE_ENV=${NODE_ENV:-"production"} +echo "WORKDIR=$WORKDIR" +echo "COMMANDS=$COMMANDS" +echo "NODE_ENV=$NODE_ENV" + cd $WORKDIR -if [ ! -d $WORKDIR/node_modules ]; then - npm install -fi +npm install eval $COMMANDS diff --git a/arch-base-nodejs/src b/arch-base-nodejs/src deleted file mode 120000 index 0c7f095..0000000 --- a/arch-base-nodejs/src +++ /dev/null @@ -1 +0,0 @@ -../../myabuy/proofn/src/sails-on-docker-test
\ No newline at end of file diff --git a/arch-base-nodejs/vars.sh b/arch-base-nodejs/vars.sh index 712a639..6417c0f 100755 --- a/arch-base-nodejs/vars.sh +++ b/arch-base-nodejs/vars.sh @@ -10,8 +10,10 @@ PKGS_REMOVED=() IMAGE_NAME="sulhan/arch-nodejs" IMAGE_ARGS=(-c="VOLUME /srv/www" -c="EXPOSE 80" -c="CMD /init.sh") +IMAGE_FILES_BAK+=("${ROOTFS}/root/.npm" "${THISD}/npm") FILES+=("${THISD}/init.sh" "${ROOTFS}/") FILES+=("${THISD}/bootstrap_nodejs.sh" "${ROOTFS}/") +FILES+=("${THISD}/npm" "${ROOTFS}/root/.npm") BOOTSTRAP_S+=("/bootstrap_nodejs.sh") |