diff options
| author | Mhd Sulhan <ms@kilabit.info> | 2015-11-28 17:37:27 +0700 |
|---|---|---|
| committer | Mhd Sulhan <ms@kilabit.info> | 2015-11-28 17:37:27 +0700 |
| commit | 2c0675fa446d7ba36b3860ba7e8894176d7178f8 (patch) | |
| tree | b4879dcb8fd096dbbfe3a86987d9a5f57f14ba9c | |
| parent | 1e9c24d3f47fbf4b22241bebfc11de9c9c615f02 (diff) | |
| download | arch-docker-2c0675fa446d7ba36b3860ba7e8894176d7178f8.tar.xz | |
Do not replace content of PKGS_REMOVED.
| -rwxr-xr-x | arch-base-gulp-etal/vars.sh | 3 | ||||
| -rwxr-xr-x | arch-base-nodejs/vars.sh | 1 | ||||
| -rwxr-xr-x | arch-base-postgresql/vars.sh | 1 | ||||
| -rwxr-xr-x | arch-base-sailsjs/vars.sh | 3 | ||||
| -rwxr-xr-x | scripts/bootstrap.sh | 5 |
5 files changed, 6 insertions, 7 deletions
diff --git a/arch-base-gulp-etal/vars.sh b/arch-base-gulp-etal/vars.sh index 88aff0c..4605621 100755 --- a/arch-base-gulp-etal/vars.sh +++ b/arch-base-gulp-etal/vars.sh @@ -6,9 +6,8 @@ ROOTFS_SIZE=900M PKGS+=(util-linux) PKGS_ADD+=(git gcc make python2 nodejs npm) -PKGS_REMOVED=() -IMAGE_NAME="sulhan/arch-gulp-etal" +IMAGE_NAME="sulhan/arch-base-gulp-etal" IMAGE_ARGS=(-c="VOLUME /srv/www" -c="VOLUME /root/.npm" -c="EXPOSE 10000" -c="CMD /init.sh") IMAGE_FILES_BAK+=("${ROOTFS}/root/.npm" "${THISD}/npm") diff --git a/arch-base-nodejs/vars.sh b/arch-base-nodejs/vars.sh index 7f8c331..b0f74d8 100755 --- a/arch-base-nodejs/vars.sh +++ b/arch-base-nodejs/vars.sh @@ -6,7 +6,6 @@ ROOTFS_SIZE=900M PKGS+=(util-linux) PKGS_ADD+=(git gcc make python2 nodejs npm) -PKGS_REMOVED=() IMAGE_NAME="sulhan/arch-nodejs" IMAGE_ARGS=(-c="VOLUME /srv/www" -c="VOLUME /root/.npm" -c="EXPOSE 80" -c="CMD /init.sh") diff --git a/arch-base-postgresql/vars.sh b/arch-base-postgresql/vars.sh index 4c4785e..3df9ec8 100755 --- a/arch-base-postgresql/vars.sh +++ b/arch-base-postgresql/vars.sh @@ -4,7 +4,6 @@ THISD=${0:a:h} PKGS+=("util-linux") PKGS_ADD+=("postgresql") -PKGS_REMOVED=() IMAGE_NAME="sulhan/arch-postgresql" IMAGE_ARGS=(-c="VOLUME /var/lib/postgres" -c="EXPOSE 5432" -c="CMD /init.sh") diff --git a/arch-base-sailsjs/vars.sh b/arch-base-sailsjs/vars.sh index 14be400..66e32f1 100755 --- a/arch-base-sailsjs/vars.sh +++ b/arch-base-sailsjs/vars.sh @@ -6,9 +6,8 @@ ROOTFS_SIZE=900M PKGS+=(util-linux) PKGS_ADD+=(git gcc make python2 nodejs npm) -PKGS_REMOVED=() -IMAGE_NAME="sulhan/arch-nodejs-sails" +IMAGE_NAME="sulhan/arch-base-sailsjs" IMAGE_ARGS=(-c="VOLUME /srv/www" -c="VOLUME /root/.npm" -c="EXPOSE 9000" -c="CMD /init.sh") IMAGE_FILES_BAK+=("${ROOTFS}/root/.npm" "${THISD}/npm") diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index b0854aa..c186b78 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -30,7 +30,10 @@ bootstrap_clean_common() { rm -rf /usr/share/info/* rm -rf /var/cache/pacman/pkg/* rm -rf /var/log/* - rm -f /*.sh + rm -f /run_bootstrap.sh + rm -f /bootstrap_base.sh + rm -f /bootstrap.sh + rm -f /vars.sh } bootstrap_hostname() { |