diff --git a/.gitignore b/.gitignore index 23a34d32..b0d15890 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ *.gem *.tar.gz - +*.tar.bz2 diff --git a/assets/build/install.sh b/assets/build/install.sh index 250ae682..5acb8ffe 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -64,7 +64,6 @@ exec_as_git git config --global gc.auto 0 exec_as_git git config --global repack.writeBitmaps true exec_as_git git config --global receive.advertisePushOptions true - # shallow clone gitlab-foss echo "Cloning gitlab-foss v.${GITLAB_VERSION}..." exec_as_git git clone -q -b v${GITLAB_VERSION} --depth 1 ${GITLAB_CLONE_URL} ${GITLAB_INSTALL_DIR} @@ -156,6 +155,7 @@ cd ${GITLAB_INSTALL_DIR} # install gems, use local cache if available if [[ -d ${GEM_CACHE_DIR} ]]; then + echo "Found local npm package cache..." mv ${GEM_CACHE_DIR} ${GITLAB_INSTALL_DIR}/vendor/cache chown -R ${GITLAB_USER}: ${GITLAB_INSTALL_DIR}/vendor/cache fi @@ -426,4 +426,4 @@ DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove ${BUILD_DEPENDENCI rm -rf /var/lib/apt/lists/* # clean up caches -exec_as_git rm -rf ${GITLAB_HOME}/.cache +rm -rf ${GITLAB_HOME}/.cache ${GITLAB_HOME}/.bundle ${GITLAB_HOME}/go