Merge pull request #2717 from kkimurak/fix-permission-error-on-copying-database.yml-for-building-image

sachilles · web-flow · commit b2465861312f · 2023-04-21T12:10:36.000+02:00
Avoid permission error on creating config file
diff --git a/assets/build/install.sh b/assets/build/install.sh
@@ -193,7 +193,8 @@ exec_as_git cp ${GITLAB_INSTALL_DIR}/config/gitlab.yml.example ${GITLAB_INSTALL_
 # Temporary workaround, see <https://github.com/sameersbn/docker-gitlab/pull/2596>
 #
 # exec_as_git cp ${GITLAB_INSTALL_DIR}/config/database.yml.postgresql ${GITLAB_INSTALL_DIR}/config/database.yml
-exec_as_git cp ${GITLAB_BUILD_DIR}/config/database.yml.postgresql ${GITLAB_INSTALL_DIR}/config/database.yml
+cp ${GITLAB_BUILD_DIR}/config/database.yml.postgresql ${GITLAB_INSTALL_DIR}/config/database.yml
+chown ${GITLAB_USER}: ${GITLAB_INSTALL_DIR}/config/database.yml
 
 # Installs nodejs packages required to compile webpack
 exec_as_git yarn install --production --pure-lockfile

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,8 @@ exec_as_git cp ${GITLAB_INSTALL_DIR}/config/gitlab.yml.example ${GITLAB_INSTALL_`
`193`	`193`	`# Temporary workaround, see <https://github.com/sameersbn/docker-gitlab/pull/2596>`
`194`	`194`	`#`
`195`	`195`	`# exec_as_git cp ${GITLAB_INSTALL_DIR}/config/database.yml.postgresql ${GITLAB_INSTALL_DIR}/config/database.yml`
`196`		`-exec_as_git cp ${GITLAB_BUILD_DIR}/config/database.yml.postgresql ${GITLAB_INSTALL_DIR}/config/database.yml`
	`196`	`+cp ${GITLAB_BUILD_DIR}/config/database.yml.postgresql ${GITLAB_INSTALL_DIR}/config/database.yml`
	`197`	`+chown ${GITLAB_USER}: ${GITLAB_INSTALL_DIR}/config/database.yml`
`197`	`198`
`198`	`199`	`# Installs nodejs packages required to compile webpack`
`199`	`200`	`exec_as_git yarn install --production --pure-lockfile`