Remove validate_site.sh script from base image
In the Kubernetes setup the filesystem permissions do not have to be
validated. Thus, the corresponding commands were removed from the
container images. Thus, the validate_site.sh script provided by the base
container image is not used anymore. This change removes it.
Change-Id: Icf560891dfd67f0be9e45d47eb8a76c5ddbd0d40
diff --git a/container-images/base/Dockerfile b/container-images/base/Dockerfile
index dd6d08c..c654e23 100644
--- a/container-images/base/Dockerfile
+++ b/container-images/base/Dockerfile
@@ -8,5 +8,3 @@
ARG GERRIT_UID=1000
RUN useradd gerrit -u $GERRIT_UID -g users
-
-COPY tools/* /var/tools/
diff --git a/container-images/base/README.md b/container-images/base/README.md
index b8b853d..1539c41 100644
--- a/container-images/base/README.md
+++ b/container-images/base/README.md
@@ -8,5 +8,3 @@
* Ubuntu 18.04
* git
* create `gerrit`-user as a non-root user to run the applications
-* `tools/validate_site.sh`: validates Gerrit site directory and ensures
- filesystem permissions for gerrit user are correct
diff --git a/container-images/base/tools/validate_site.sh b/container-images/base/tools/validate_site.sh
deleted file mode 100755
index 2356228..0000000
--- a/container-images/base/tools/validate_site.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-dir=$1
-target_uid=$2
-target_gid=$3
-
-check_fs_permissions(){
- actual_uid=$(ls -lnd $dir | tr -s ' ' | cut -d ' ' -f 3)
- actual_gid=$(ls -lnd $dir | tr -s ' ' | cut -d ' ' -f 4)
-
- if [ ! -d "$dir" ]; then
- echo "The provided site seems to be invalid. Missing: $dir"
- return 1
- fi
-
- if [[ "$actual_uid" != "$target_uid" ]]; then
- echo "The provided Gerrit site is not owned by the correct UID."
- echo "$dir should be owned by user $target_uid, but is owned by $actual_uid"
- return 1
- fi
-
- if [[ "$actual_gid" != "$target_gid" ]]; then
- echo "The provided Gerrit site is not owned by the correct GID."
- echo "$dir should be owned by group $target_gid, but is owned by $actual_gid"
- return 1
- fi
-
- if [ ! -r "$dir" ]; then
- echo "Cannot read $dir."
- return 1
- fi
-
- if [ ! -w "$dir" ]; then
- echo "Cannot write in $dir."
- return 1
- fi
-
- return 0
-}
-
-fix_fs_permissions(){
- echo "Trying to fix file permissions"
- chown -R $target_uid:$target_gid $dir
- chmod -R 755 $dir
- check_fs_permissions || {
- echo "Failed to fix file permissions. Please fix them manually on the host system.";
- exit 1;
- }
- echo "Success!"
- echo ""
-}
-
-check_fs_permissions || {
- [[ "$FIXFS" == "true" ]] && fix_fs_permissions
-}
