fix run

2.414.3

Dockerfile

@@ -2,22 +2,26 @@ FROM ubuntu:20.04
 
 LABEL maintainer="ovsyannikov.alexey95@gmail.com"
 
-USER root
+RUN mv /bin/sh /bin/sh.old && ln -s /bin/bash /bin/sh
 
 ENV TZ=Etc/GMT
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-RUN apt update && apt -y install wget gnupg2 openjdk-11-jdk zip unzip curl sudo git software-properties-common pass axel
+RUN apt update && apt -y install wget gnupg2 zip unzip curl sudo git software-properties-common pass axel
 
 RUN mkdir -p /var/jenkins_home/jenkins && cd /var/jenkins_home/ &&\
     useradd -s /bin/bash -G sudo -d /var/jenkins_home -u 1000 jenkins &&\
     chmod 777 /tmp
-
-ENTRYPOINT /var/jenkins_home/run
 COPY ./run /var/jenkins_home/
 RUN chown -R jenkins:jenkins /var/jenkins_home
 
-USER 1000
+USER jenkins
 
+RUN curl -s "https://get.sdkman.io" | bash
+RUN source "$HOME/.sdkman/bin/sdkman-init.sh" &&\
+    sdk install java `sdk ls java | grep librca | grep " 17" | grep -m 1 -Eo "(.?[0-9]{1,2}){3}" | head -1`-librca &&\
+    sdk default java `sdk ls java | grep librca | grep " 17" | grep -m 1 -Eo "(.?[0-9]{1,2}){3}" | head -1`-librca
+
+RUN cd /var/jenkins_home/ && wget http://mirrors.jenkins.io/war-stable/2.426.1/jenkins.war
+
+ENTRYPOINT /var/jenkins_home/run
 VOLUME /var/jenkins_home/jenkins
-
-RUN cd /var/jenkins_home/ && axel -a -n 8 --max-redirect=256 http://mirrors.jenkins.io/war-stable/2.361.1/jenkins.war

autoupdate.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [ -z "$1" ]; then
+  newVersion="2.246.1"
+else
+  newVersion="$1"
+fi
+
+sed -i -E "s/[0-9\.]+\/jenkins.war/${newVersion}\/jenkins.war/g" Dockerfile
+sed -i -E "s/version=\"[0-9\.]+\"/version=\"${newVersion}\"/g" deploy
+

deploy

@@ -9,7 +9,7 @@ function assert_success() {
     fi
 }
 
-version="2.361.1"
+version="2.426.1"
 
 assert_success docker build -t jenkins:$version ./
 assert_success docker tag jenkins:$version insanusmokrassar/jenkins:$version

run

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source "$HOME/.bashrc"
+
 export JENKINS_HOME="$HOME/jenkins"
 
 java $JENKINS_LAUNCH_ARGS -jar ~/jenkins.war