diff --git a/Dockerfile b/Dockerfile index ebf60257..db9a17ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -84,7 +84,7 @@ LABEL \ EXPOSE 22/tcp 80/tcp 443/tcp -VOLUME ["${GITLAB_DATA_DIR}", "${GITLAB_LOG_DIR}","${GITLAB_HOME}/gitlab/node_modules"] +VOLUME ["${GITLAB_DATA_DIR}", "${GITLAB_LOG_DIR}"] WORKDIR ${GITLAB_INSTALL_DIR} ENTRYPOINT ["/sbin/entrypoint.sh"] CMD ["app:start"] diff --git a/assets/build/patches/gitlabhq/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch b/assets/build/patches/gitlabhq/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch.bak similarity index 100% rename from assets/build/patches/gitlabhq/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch rename to assets/build/patches/gitlabhq/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch.bak diff --git a/assets/build/patches/gitlabhq/0004-fix-raketask-gitlab-assets-compile.patch b/assets/build/patches/gitlabhq/0004-fix-raketask-gitlab-assets-compile.patch.bak similarity index 100% rename from assets/build/patches/gitlabhq/0004-fix-raketask-gitlab-assets-compile.patch rename to assets/build/patches/gitlabhq/0004-fix-raketask-gitlab-assets-compile.patch.bak diff --git a/assets/runtime/functions b/assets/runtime/functions index de90c30a..31da143c 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1756,25 +1756,6 @@ initialize_datadir() { chmod 700 ${GITLAB_DATA_DIR}/.ssh chmod 600 ${GITLAB_DATA_DIR}/.ssh/authorized_keys chown -R ${GITLAB_USER}: ${GITLAB_DATA_DIR}/.ssh - - # recompile and persist assets when relative_url is in use - if [[ -n ${GITLAB_RELATIVE_URL_ROOT} ]]; then - mkdir -p ${GITLAB_TEMP_DIR}/cache - chmod 755 ${GITLAB_TEMP_DIR}/cache - chown ${GITLAB_USER}: ${GITLAB_TEMP_DIR}/cache - - mkdir -p ${GITLAB_TEMP_DIR}/assets - chmod 755 ${GITLAB_TEMP_DIR}/assets - chown ${GITLAB_USER}: ${GITLAB_TEMP_DIR}/assets - - # symlink ${GITLAB_INSTALL_DIR}/tmp/cache -> ${GITLAB_TEMP_DIR}/cache - rm -rf ${GITLAB_INSTALL_DIR}/tmp/cache - exec_as_git ln -s ${GITLAB_TEMP_DIR}/cache ${GITLAB_INSTALL_DIR}/tmp/cache - - # symlink ${GITLAB_INSTALL_DIR}/public/assets -> ${GITLAB_TEMP_DIR}/assets - rm -rf ${GITLAB_INSTALL_DIR}/public/assets - exec_as_git ln -s ${GITLAB_TEMP_DIR}/assets ${GITLAB_INSTALL_DIR}/public/assets - fi } sanitize_datadir() { @@ -2250,19 +2231,6 @@ migrate_database() { # clear cache if relative_url has changed. [[ -f ${GITLAB_TEMP_DIR}/GITLAB_RELATIVE_URL_ROOT ]] && CACHE_GITLAB_RELATIVE_URL_ROOT=$(cat ${GITLAB_TEMP_DIR}/GITLAB_RELATIVE_URL_ROOT) if [[ ! -f ${GITLAB_TEMP_DIR}/GITLAB_RELATIVE_URL_ROOT || ${GITLAB_RELATIVE_URL_ROOT} != ${CACHE_GITLAB_RELATIVE_URL_ROOT} ]]; then - # assets need to be recompiled when GITLAB_RELATIVE_URL_ROOT is used - if [[ -n ${GITLAB_RELATIVE_URL_ROOT} ]]; then - if [[ ! -d ${GITLAB_HOME}/gitlab/node_modules ]]; then - mkdir -p ${GITLAB_HOME}/gitlab/node_modules - chown -R ${GITLAB_USER}: ${GITLAB_HOME}/gitlab/node_modules - fi - echo "Prepare recompile assets... Installing missing node_modules for assets" - chown -R ${GITLAB_USER}: ${GITLAB_HOME}/gitlab/node_modules - exec_as_git yarn install --production --pure-lockfile - echo "Recompiling assets (relative_url in use), this could take a while..." - exec_as_git bundle exec rake gitlab:assets:compile NODE_OPTIONS="--max-old-space-size=8192" >/dev/null 2>&1 - fi - echo "Clearing cache..." exec_as_git bundle exec rake cache:clear >/dev/null 2>&1 echo "${GITLAB_RELATIVE_URL_ROOT}" > ${GITLAB_TEMP_DIR}/GITLAB_RELATIVE_URL_ROOT