fixup! modernize big RUN blocks with <<'EOF' notation

citusdata · Jul 11, 2024 · b9f5f67 · b9f5f67
1 parent df99671
commit b9f5f67
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 11 deletions.
diff --git a/circleci/images/citusupgradetester/Dockerfile b/circleci/images/citusupgradetester/Dockerfile
@@ -83,7 +83,7 @@ EOF
 ENV PATH=/usr/lib/postgresql/$PG_MAJOR/bin/:$PATH
 
 # setup /var/run/postgresql for use with circleci
-# RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgresql && chmod 2777 /var/run/postgresql
+RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgresql && chmod 2777 /var/run/postgresql
 
 ##############################################################################
 FROM base AS builder
@@ -123,6 +123,3 @@ ENV CITUS_VERSIONS=$CITUS_VERSIONS
 
 # copy compiled citus versions
 COPY --from=builder /build/ /
-
-USER circleci
-WORKDIR /home/circleci
diff --git a/circleci/images/exttester/Dockerfile b/circleci/images/exttester/Dockerfile
@@ -177,10 +177,9 @@ EOF
 ENV PATH=/usr/lib/postgresql/$PG_MAJOR/bin/:$PATH
 
 # setup /var/run/postgresql for use with circleci
-# RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgresql && chmod 2777 /var/run/postgresql
+RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgresql && chmod 2777 /var/run/postgresql
 
 # copy the collected files from the collection container at once into the final container
 COPY --from=dev-tools-collection /collect/ /
 
-USER circleci
 WORKDIR /home/circleci
diff --git a/circleci/images/failtester/Dockerfile b/circleci/images/failtester/Dockerfile
@@ -87,5 +87,4 @@ RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgres
 COPY ./files/etc/requirements.txt /tmp/etc/
 RUN pip3 install -Ir /tmp/etc/requirements.txt
 
-USER circleci
 WORKDIR /home/circleci
diff --git a/circleci/images/pgupgradetester/Dockerfile b/circleci/images/pgupgradetester/Dockerfile
@@ -89,10 +89,7 @@ rm -rf /var/lib/apt/lists/*
 EOF
 
 # setup /var/run/postgresql for use with circleci
-# RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgresql && chmod 2777 /var/run/postgresql
+RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgresql && chmod 2777 /var/run/postgresql
 
 COPY ./files/etc/requirements.txt /tmp/etc/
 RUN pip3 install -Ir /tmp/etc/requirements.txt
-
-USER circleci
-WORKDIR /home/circleci