mirror of
https://github.com/Xahau/xahaud.git
synced 2025-11-20 10:35:50 +00:00
Allow non-root users to build packages.
This commit is contained in:
@@ -65,7 +65,7 @@ if (is_root_project)
|
|||||||
-v ${CMAKE_CURRENT_BINARY_DIR}/packages:/opt/rippled_bld/pkg/out
|
-v ${CMAKE_CURRENT_BINARY_DIR}/packages:/opt/rippled_bld/pkg/out
|
||||||
"$<$<BOOL:${map_user}>:--volume=/etc/passwd:/etc/passwd;--volume=/etc/group:/etc/group;--user=${DOCKER_USER_ID}:${DOCKER_GROUP_ID}>"
|
"$<$<BOOL:${map_user}>:--volume=/etc/passwd:/etc/passwd;--volume=/etc/group:/etc/group;--user=${DOCKER_USER_ID}:${DOCKER_GROUP_ID}>"
|
||||||
-t rippled-rpm-builder:${container_label}
|
-t rippled-rpm-builder:${container_label}
|
||||||
/bin/bash -c "cp -pu rippled/Builds/containers/packaging/rpm/build_rpm.sh . && ./build_rpm.sh"
|
/bin/bash -c "cp -fpu rippled/Builds/containers/packaging/rpm/build_rpm.sh . && ./build_rpm.sh"
|
||||||
VERBATIM
|
VERBATIM
|
||||||
USES_TERMINAL
|
USES_TERMINAL
|
||||||
COMMAND_EXPAND_LISTS
|
COMMAND_EXPAND_LISTS
|
||||||
@@ -128,7 +128,7 @@ if (is_root_project)
|
|||||||
-v ${CMAKE_CURRENT_BINARY_DIR}/packages:/opt/rippled_bld/pkg/out
|
-v ${CMAKE_CURRENT_BINARY_DIR}/packages:/opt/rippled_bld/pkg/out
|
||||||
"$<$<BOOL:${map_user}>:--volume=/etc/passwd:/etc/passwd;--volume=/etc/group:/etc/group;--user=${DOCKER_USER_ID}:${DOCKER_GROUP_ID}>"
|
"$<$<BOOL:${map_user}>:--volume=/etc/passwd:/etc/passwd;--volume=/etc/group:/etc/group;--user=${DOCKER_USER_ID}:${DOCKER_GROUP_ID}>"
|
||||||
-t rippled-dpkg-builder:${container_label}
|
-t rippled-dpkg-builder:${container_label}
|
||||||
/bin/bash -c "cp -pu rippled/Builds/containers/packaging/dpkg/build_dpkg.sh . && ./build_dpkg.sh"
|
/bin/bash -c "cp -fpu rippled/Builds/containers/packaging/dpkg/build_dpkg.sh . && ./build_dpkg.sh"
|
||||||
VERBATIM
|
VERBATIM
|
||||||
USES_TERMINAL
|
USES_TERMINAL
|
||||||
COMMAND_EXPAND_LISTS
|
COMMAND_EXPAND_LISTS
|
||||||
|
|||||||
@@ -3,9 +3,9 @@ set -ex
|
|||||||
|
|
||||||
# make sure pkg source files are up to date with repo
|
# make sure pkg source files are up to date with repo
|
||||||
cd /opt/rippled_bld/pkg
|
cd /opt/rippled_bld/pkg
|
||||||
cp -pru rippled/Builds/containers/packaging/dpkg/debian/. debian/
|
cp -fpru rippled/Builds/containers/packaging/dpkg/debian/. debian/
|
||||||
cp -pu rippled/Builds/containers/shared/rippled.service debian/
|
cp -fpu rippled/Builds/containers/shared/rippled.service debian/
|
||||||
cp -pu rippled/Builds/containers/shared/update_sources.sh .
|
cp -fpu rippled/Builds/containers/shared/update_sources.sh .
|
||||||
source update_sources.sh
|
source update_sources.sh
|
||||||
|
|
||||||
# Build the dpkg
|
# Build the dpkg
|
||||||
|
|||||||
@@ -2,8 +2,8 @@
|
|||||||
set -ex
|
set -ex
|
||||||
|
|
||||||
cd /opt/rippled_bld/pkg
|
cd /opt/rippled_bld/pkg
|
||||||
cp -pu rippled/Builds/containers/packaging/rpm/rippled.spec .
|
cp -fpu rippled/Builds/containers/packaging/rpm/rippled.spec .
|
||||||
cp -pu rippled/Builds/containers/shared/update_sources.sh .
|
cp -fpu rippled/Builds/containers/shared/update_sources.sh .
|
||||||
source update_sources.sh
|
source update_sources.sh
|
||||||
|
|
||||||
# Build the rpm
|
# Build the rpm
|
||||||
|
|||||||
Reference in New Issue
Block a user