From e39c889b5de254ad775d2f39a07347a58b8a874f Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 14 Aug 2024 14:26:14 +0200 Subject: [PATCH] Polishing. Replace spaces with tabs. See #93 --- ci/Dockerfile | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/ci/Dockerfile b/ci/Dockerfile index 4df6eb9..bff7b36 100755 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -7,21 +7,20 @@ ARG USER_UID="1001" ARG USER_GID="1001" ARG USER_NAME="jenkins" - RUN groupadd -g $USER_GID $USER_NAME && \ useradd -m -g $USER_GID -u $USER_UID $USER_NAME RUN set -eux; \ - touch /etc/apt/apt.conf.d/99verify-peer.conf && \ - echo >>/etc/apt/apt.conf.d/99verify-peer.conf "Acquire { https::Verify-Peer false }" && \ + touch /etc/apt/apt.conf.d/99verify-peer.conf && \ + echo >>/etc/apt/apt.conf.d/99verify-peer.conf "Acquire { https::Verify-Peer false }" && \ sed -i -e 's/archive.ubuntu.com/atl.mirrors.clouvider.net\/ubuntu/g' /etc/apt/sources.list && \ sed -i -e 's/security.ubuntu.com/atl.mirrors.clouvider.net\/ubuntu/g' /etc/apt/sources.list && \ sed -i -e 's/ports.ubuntu.com/ftp.tu-chemnitz.de\/pub\/linux/g' /etc/apt/sources.list && \ sed -i -e 's/http/https/g' /etc/apt/sources.list && \ apt-get update && \ - apt-get -y install curl zip gnupg gnupg1 libfreetype6 fontconfig wget git && \ - rm -rf /var/lib/apt/lists/* && \ - rm -rf /tmp/* + apt-get -y install curl zip gnupg gnupg1 libfreetype6 fontconfig wget git && \ + rm -rf /var/lib/apt/lists/* && \ + rm -rf /tmp/* USER $USER_UID:$USER_GID @@ -31,9 +30,9 @@ COPY java-tools.properties /temp/java-tools.properties RUN curl -s "https://get.sdkman.io" | bash RUN bash -c "cd /temp && \ - ./java-init.sh && \ - rm -rf $HOME/.sdkman/archives/* && \ - rm -rf $HOME/.sdkman/tmp/*" + ./java-init.sh && \ + rm -rf $HOME/.sdkman/archives/* && \ + rm -rf $HOME/.sdkman/tmp/*" ENV MAVEN_HOME="$HOME/.sdkman/candidates/maven/current" ENV JAVA_HOME="$HOME/.sdkman/candidates/java/current"