Update autoupdate.sh

2.414.3

.github/workflows/docker-publish.yml

@@ -4,7 +4,7 @@ on:
     branches:
       - master
 jobs:
-  publishing:
+  publish_jenkins:
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -17,5 +17,26 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_LOGIN }}
           password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Update version
+        run: ./autoupdate.sh
       - name: Deploy
         run: ./deploy
+  publish_jenkins_ssh-agent:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+      - name: Log into registry
+        uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
+        with:
+          username: ${{ secrets.DOCKER_LOGIN }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Update version
+        working-directory: ./ssh-agent/
+        run: ./autoupdate.sh
+      - name: Deploy
+        working-directory: ./ssh-agent/
+        run: ./deploy

Dockerfile

@@ -1,23 +1,28 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.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-17-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 deluser --remove-home ubuntu
 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.492.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.414.1/jenkins.war

autoupdate.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [ -z "$1" ]; then
+  newVersion="2.516.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,10 +9,11 @@ function assert_success() {
     fi
 }
 
-version="2.414.1"
+version="2.492.1"
+image_name=jenkins
 
-assert_success docker build -t jenkins:$version ./
-assert_success docker tag jenkins:$version insanusmokrassar/jenkins:$version
-assert_success docker tag jenkins:$version insanusmokrassar/jenkins:latest
-assert_success docker push insanusmokrassar/jenkins:$version
-assert_success docker push insanusmokrassar/jenkins:latest
+assert_success docker build -t $image_name:$version ./
+assert_success docker tag $image_name:$version insanusmokrassar/$image_name:$version
+assert_success docker tag $image_name:$version insanusmokrassar/$image_name:latest
+assert_success docker push insanusmokrassar/$image_name:$version
+assert_success docker push insanusmokrassar/$image_name:latest

run

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

ssh-agent/Dockerfile

@@ -0,0 +1,20 @@
+FROM jenkins/ssh-agent:5.38.0-jdk17 as ssh-agent
+
+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 zip unzip curl sudo git software-properties-common pass axel
+
+RUN chmod 777 /tmp
+
+#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

ssh-agent/autoupdate.sh

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

ssh-agent/deploy

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+function assert_success() {
+    "${@}"
+    local status=${?}
+    if [ ${status} -ne 0 ]; then
+        echo "### Error ${status} at: ${BASH_LINENO[*]} ###"
+        exit ${status}
+    fi
+}
+
+version="5.38.0"
+image_name=jenkins-ssh-agent
+
+assert_success docker build -t $image_name:$version ./
+assert_success docker tag $image_name:$version insanusmokrassar/$image_name:$version
+assert_success docker tag $image_name:$version insanusmokrassar/$image_name:latest
+assert_success docker push insanusmokrassar/$image_name:$version
+assert_success docker push insanusmokrassar/$image_name:latest