keep dockerfiles in sync between open-source and pro (#14624)

rstudio · May 1, 2024 · f4576de · f4576de
1 parent 61ab68b
commit f4576de
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/docker/jenkins/Dockerfile.bionic b/docker/jenkins/Dockerfile.bionic
@@ -45,7 +45,6 @@ RUN apt-get update && \
     libssl-dev \
     libssh2-1-dev \
     libtiff5-dev\
-    libuser1-dev \
     libxml2-dev \
     libxslt1-dev \
     lsof \
@@ -140,3 +139,5 @@ RUN groupadd -g $JENKINS_GID jenkins && \
     useradd -m -d /var/lib/jenkins -u $JENKINS_UID -g jenkins jenkins && \
     echo "jenkins ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
 
+
+RUN if [ -d "/src" ]; then git config --global --add safe.directory /src; fi
diff --git a/docker/jenkins/Dockerfile.focal b/docker/jenkins/Dockerfile.focal
@@ -44,7 +44,6 @@ RUN apt-get update && \
     libsqlite3-dev \
     libssl-dev \
     libtiff5-dev \
-    libuser1-dev \
     libxml2-dev \
     libxslt1-dev \
     lsof \
@@ -63,6 +62,7 @@ RUN apt-get update && \
     xvfb \
     zlib1g-dev
 
+
 # If ARCH=amd64, install gcc-multilib
 RUN if [ "$ARCH" = "amd64" ]; then \
     apt-get update && \
@@ -140,3 +140,4 @@ RUN groupadd -g $JENKINS_GID jenkins && \
     useradd -m -d /var/lib/jenkins -u $JENKINS_UID -g jenkins jenkins && \
     echo "jenkins ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
 
+RUN if [ -d "/src" ]; then git config --global --add safe.directory /src; fi
diff --git a/docker/jenkins/Dockerfile.jammy b/docker/jenkins/Dockerfile.jammy
@@ -45,7 +45,6 @@ RUN apt-get update && \
     libsqlite3-dev \
     libssl-dev \
     libtiff5-dev\
-    libuser1-dev \
     libxml2-dev \
     libxslt1-dev \
     lsof \
@@ -133,3 +132,4 @@ RUN groupadd -g $JENKINS_GID jenkins && \
     useradd -m -d /var/lib/jenkins -u $JENKINS_UID -g jenkins jenkins && \
     echo "jenkins ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
 
+RUN if [ -d "/src" ]; then git config --global --add safe.directory /src; fi
diff --git a/docker/jenkins/Dockerfile.opensuse15 b/docker/jenkins/Dockerfile.opensuse15
@@ -33,7 +33,6 @@ RUN zypper --non-interactive --gpg-auto-import-keys refresh && \
     libopenssl-devel \
     libpng-devel  \
     libtiff-devel  \
-    libuser-devel \
     libuuid-devel \
     libxml2-devel \
     lsof \
@@ -130,3 +129,5 @@ ARG JENKINS_UID=999
 RUN groupadd -g $JENKINS_GID jenkins && \
     useradd -m -d /var/lib/jenkins -u $JENKINS_UID -g jenkins jenkins && \
     echo "jenkins ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+
+RUN if [ -d "/src" ]; then git config --global --add safe.directory /src; fi
diff --git a/docker/jenkins/Dockerfile.rhel8 b/docker/jenkins/Dockerfile.rhel8
@@ -34,7 +34,6 @@ RUN yum install -y \
     libcap-devel \ 
     libcurl-devel \
     libpq-devel \
-    libuser \
     libuuid-devel \
     libxml2-devel \
     llvm-devel \
@@ -146,3 +145,5 @@ RUN /tmp/clean-uid.sh $JENKINS_UID && \
 RUN groupadd -g $JENKINS_GID jenkins && \
     useradd -m -d /var/lib/jenkins -u $JENKINS_UID -g jenkins jenkins && \
     echo "jenkins ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+
+RUN if [ -d "/src" ]; then git config --global --add safe.directory /src; fi
diff --git a/docker/jenkins/Dockerfile.rhel9 b/docker/jenkins/Dockerfile.rhel9
@@ -41,7 +41,6 @@ RUN dnf install -y \
     libjpeg-turbo-devel \
     libpng-devel \
     libtiff-devel \
-    libuser-devel \
     libuuid-devel \
     llvm-devel \
     lsof \
@@ -136,3 +135,5 @@ RUN /tmp/clean-uid.sh $JENKINS_UID && \
 RUN groupadd -g $JENKINS_GID jenkins && \
     useradd -m -d /var/lib/jenkins -u $JENKINS_UID -g jenkins jenkins && \
     echo "jenkins ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+
+RUN if [ -d "/src" ]; then git config --global --add safe.directory /src; fi