refactor: 💡 Added TODO comment to fix alpine image, still not working doing that later

.vscode/jenkins-ssh-docker-agent.code-workspace

@@ -0,0 +1,8 @@
+{
+	"folders": [
+		{
+			"path": ".."
+		}
+	],
+	"settings": {}
+}

Dockerfile

@@ -1,50 +1,26 @@
-FROM jenkins/ssh-agent
+FROM jenkins/ssh-agent:latest-jdk21
 
 RUN groupadd -g 281 docker
 RUN usermod -aG docker jenkins
 
 RUN apt-get update
-RUN apt-get install -y\
-        ca-certificates \
-        curl \
-        gnupg
+RUN apt-get install -y ca-certificates \
+      curl \
+      gnupg
 
 RUN mkdir -m 0755 -p /etc/apt/keyrings
 RUN curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
 
 RUN echo \
       "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian \
-      "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | \
-      tee /etc/apt/sources.list.d/docker.list > /dev/null
+      "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | tee /etc/apt/sources.list.d/docker.list >/dev/null
 
 RUN apt-get update
 RUN apt-get install -y docker-ce-cli
 
-# Install flutter
-RUN apt-get update
-RUN apt-get install -y\
-      curl git wget \
-      unzip libgconf-2-4 gdb \
-      libstdc++6 libglu1-mesa fonts-droid-fallback \
-      lib32stdc++6 python3 sed
-
-RUN git clone https://github.com/flutter/flutter.git /usr/local/flutter
-RUN git config --global --add safe.directory /usr/local/flutter
-
-ENV PATH="/usr/local/flutter/bin:/usr/local/flutter/bin/cache/dart-sdk/bin:${PATH}"
-
-RUN chown -R jenkins:jenkins /usr/local/flutter
-
-# Run flutter doctor and upgrade
-USER jenkins
-
-RUN flutter config --no-cli-animations
-RUN flutter doctor -v
-RUN flutter channel master
-RUN flutter upgrade
-
-USER root
-
 #Install OpenSSL
-RUN apt-get update
-RUN apt-get install -y openssl
+RUN apt-get install -y openssl
+
+#Install git lfs
+RUN apt-get install -y git-lfs
+RUN git lfs install --system

Jenkinsfile

@@ -1,7 +1,9 @@
 #!groovy
 
 pipeline {
-    agent none
+    agent {
+        label 'linux'
+    }
 
     stages {
         stage('Build/Push Docker Image') {
@@ -9,42 +11,58 @@ pipeline {
                 beforeAgent true;
                 branch 'main'
             }
-            agent {
-                label 'linux'
-            }
             environment {
-                DOCKER_HUB_CREDENTIALS = credentials('docker-hub-fah16145')
+                def tag = sh(returnStdout: true, script: 'git rev-parse --short=10 HEAD').trim()
             }
             stages {
                 stage('Login') {
+                    environment {
+                        DOCKER_HUB_CREDENTIALS = credentials('docker-hub-fah16145')
+                        PACKAGE_REGISTRY_CREDENTIALS = credentials('gitea-package-registry-jenkins-user')
+                    }
                     steps {
                         sh 'docker login -u ${DOCKER_HUB_CREDENTIALS_USR} -p ${DOCKER_HUB_CREDENTIALS_PSW}'
+                        sh 'docker login -u ${PACKAGE_REGISTRY_CREDENTIALS_USR} -p ${PACKAGE_REGISTRY_CREDENTIALS_PSW} gitea.fahrecker.com'
                     }
                 }
-                stage('Default Image') {
-                    stages {
-                        stage('Build') {
-                            steps {
-                                sh 'docker build -t fah16145/jenkins-ssh-docker-agent:latest .'
+                stage('Build & Push') {
+                    parallel {
+                        stage('Default Image') {
+                            stages {
+                                stage('Build Default Image') {
+                                    steps {
+                                        sh '''docker build \
+                                            -t fah16145/jenkins-ssh-docker-agent:latest \
+                                            -t gitea.fahrecker.com/andreas-personal/jenkins-ssh-docker-agent:latest \
+                                            .
+                                        '''
+                                    }
+                                }
+                                stage('Push Default Image') {
+                                    steps {
+                                        sh 'docker push fah16145/jenkins-ssh-docker-agent:latest'
+                                        sh 'docker push gitea.fahrecker.com/andreas-personal/jenkins-ssh-docker-agent:latest'
+                                    }
+                                }
                             }
                         }
-                        stage('Push') {
-                            steps {
-                                sh 'docker push fah16145/jenkins-ssh-docker-agent:latest'
-                            }
-                        }
-                    }
-                }
-                stage('Alpine Image') {
-                    stages {
-                        stage('Build') {
-                            steps {
-                                sh 'docker build -t fah16145/jenkins-ssh-docker-agent:alpine alpine/'
-                            }
-                        }
-                        stage('Push') {
-                            steps {
-                                sh 'docker push fah16145/jenkins-ssh-docker-agent:alpine'
+                        stage('Alpine Image') {
+                            stages {
+                                stage('Build Alpine Image') {
+                                    steps {
+                                        sh '''docker build \
+                                            -t fah16145/jenkins-ssh-docker-agent:alpine \
+                                            -t gitea.fahrecker.com/andreas-personal/jenkins-ssh-docker-agent:alpine \
+                                            alpine/
+                                        '''
+                                    }
+                                }
+                                stage('Push Alpine Image') {
+                                    steps {
+                                        sh 'docker push fah16145/jenkins-ssh-docker-agent:alpine'
+                                        sh 'docker push gitea.fahrecker.com/andreas-personal/jenkins-ssh-docker-agent:alpine'
+                                    }
+                                }
                             }
                         }
                     }

alpine/Dockerfile

@@ -1,14 +1,25 @@
-FROM jenkins/ssh-agent:alpine
+FROM jenkins/ssh-agent:alpine-jdk21
 
 RUN addgroup --gid 281 docker
 RUN addgroup jenkins docker
 
 RUN apk add --no-cache docker docker-compose
 
-# Install flutter
-RUN apk add --no-cache flutter
+# Install tea
+RUN apk add --no-cache tea
 
-RUN flutter config --no-cli-animations
-RUN flutter doctor -v
-RUN flutter channel master
-RUN flutter upgrade
+#Install OpenSSL
+RUN apk add --no-cache openssl
+
+#Install git lfs
+RUN apk add --no-cache git-lfs
+RUN git lfs install --system
+
+
+# TODO: doesnt work still, something about not finding the java binary over ssh
+# Configure SSH to behave more like Debian - load environment properly
+#RUN echo 'PermitUserEnvironment yes' >> /etc/ssh/sshd_config
+#RUN echo 'UsePAM yes' >> /etc/ssh/sshd_config
+
+# Add Java to environment file that SSH will read
+#RUN echo 'PATH=/opt/java/openjdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' >> /etc/environment