Skip to content

Commit

Permalink
CI docker uses correct uid/gip with use of create-user.sh script
Browse files Browse the repository at this point in the history
 patch by Siyao He; reviewed by Mick Semb Wever for CASSANDRA-18971
  • Loading branch information
SiyaoIsHiding authored and michaelsembwever committed Sep 26, 2024
1 parent 692a922 commit 2c753aa
Show file tree
Hide file tree
Showing 2 changed files with 66 additions and 1 deletion.
7 changes: 6 additions & 1 deletion Jenkinsfile-asf
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,12 @@ pipeline {
}

def executeTests() {
sh "docker run -e TEST_JAVA_VERSION=${TEST_JAVA_VERSION} -e SERVER_VERSION=${SERVER_VERSION} -v \$(pwd):/home/docker/cassandra-java-driver apache.jfrog.io/cassan-docker/apache/cassandra-java-driver-testing-ubuntu2204 cassandra-java-driver/ci/run-tests.sh"
sh """
container_id=\$(docker run -td -e TEST_JAVA_VERSION=${TEST_JAVA_VERSION} -e SERVER_VERSION=${SERVER_VERSION} -v \$(pwd):/home/docker/cassandra-java-driver apache.jfrog.io/cassan-docker/apache/cassandra-java-driver-testing-ubuntu2204 'sleep 2h')
docker exec --user root \$container_id bash -c \"sudo bash /home/docker/cassandra-java-driver/ci/create-user.sh docker \$(id -u) \$(id -g) /home/docker/cassandra-java-driver\"
docker exec --user docker \$container_id './cassandra-java-driver/ci/run-tests.sh'
( nohup docker stop \$container_id >/dev/null 2>/dev/null & )
"""
}

// branch pattern for cron
Expand Down
60 changes: 60 additions & 0 deletions ci/create-user.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
#!/bin/bash
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

################################
#
# Prep
#
################################

if [ "$1" == "-h" ]; then
echo "$0 [-h] <username> <uid> <gid>"
echo " this script is used internally by other scripts in the same directory to create a user with the running host user's same uid and gid"
exit 1
fi

# arguments
username=$1
uid=$2
gid=$3
BUILD_HOME=$4

################################
#
# Main
#
################################

# disable git directory ownership checks
su ${username} -c "git config --global safe.directory '*'"

if grep "^ID=" /etc/os-release | grep -q 'debian\|ubuntu' ; then
deluser docker
adduser --quiet --disabled-login --no-create-home --uid $uid --gecos ${username} ${username}
groupmod --non-unique -g $gid $username
gpasswd -a ${username} sudo >/dev/null
else
adduser --no-create-home --uid $uid ${username}
fi

# sudo priviledges
echo "${username} ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/${username}
chmod 0440 /etc/sudoers.d/${username}

# proper permissions
chown -R ${username}:${username} /home/docker
chmod og+wx ${BUILD_HOME}

0 comments on commit 2c753aa

Please sign in to comment.