From 8df32d209fab50df07047a869aeeee0b684f2202 Mon Sep 17 00:00:00 2001
From: koopa <ldr@smsoft.kr>
Date: Fri, 21 Apr 2023 13:52:26 +0900
Subject: [PATCH] =?UTF-8?q?jenkins=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/compose/jenkins-agent.yaml             | 35 -------------
 docker/compose/jenkins.yaml                   | 50 ++++++++++++++++++-
 .../Dockerfile-jenkins_ssh-agent_nodejs-1816  | 13 +++++
 3 files changed, 62 insertions(+), 36 deletions(-)
 delete mode 100644 docker/compose/jenkins-agent.yaml
 create mode 100644 docker/dockerfile/Dockerfile-jenkins_ssh-agent_nodejs-1816

diff --git a/docker/compose/jenkins-agent.yaml b/docker/compose/jenkins-agent.yaml
deleted file mode 100644
index 00fd727..0000000
--- a/docker/compose/jenkins-agent.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-version: "3"
-
-services:
-  jenkins:
-    image: jenkins-docker-agent:lts-jdk17
-    container_name: jenkins-agent
-    volumes:
-      - temp:/tmp
-      - run:/run
-      - varrun:/var/run
-      - key:/home/jenkins/.jenkins
-      - home:/home/jenkins/agent
-      - /var/run/docker.sock:/var/run/docker.sock
-    environment:
-      - JENKINS_AGENT_SSH_PUBKEY=${pubkey}
-      #pubkey : ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC/5EaeHPy5o1TJL8IomP2AjqVkivzN8RAJEiimFb2fEgdmznMcCq7hDzpFakpQC65+siDfg8BDTpwftuYe8mhkcsPeQqXlD2p8hAdC4IG6Ga1tzKy8YAKEvUR9dGcQYcwRe/VSsr2R7WEo7BxU6QYRCg1PutA82iZToBd85xpliiU9+iGSxNDLCQldvdRNCcanay4bg9vTg1VM9EkTOb3yKL988Lsv3pckB0eE4+1IF1a/LpYdrAolR39umi6qFDSlUCsoiEvBihwnC5Q0uVwAIqc5umadH0PNAvfbxOPVOIfbxdZkwiRZUk6h8gvwFillcewFJjfOCXbV2gsOAYtR9UoivN4bB2HzQzkbjS0VcSJnEBv2Qp3Xn3vXMcj1Xpgo5IOQFmicN0bo0hkXOIGEJLr1V0CqowfE05CaF4pRtDRUQKEvxRPZ94qdTeHSdfz4awdqMcjTkp4j2cAGLqRcmPFGIihoOYFZcfOaarSsR1n3UFOmfbzYWMUJEzcfrB0=
-    networks:
-      - net-public
-
-volumes:
-  temp:
-    driver: local
-  run:
-    driver: local
-  varrun:
-    driver: local
-  key:
-    driver: local
-  home:
-    driver: local
-
-networks:
-  net-public:
-    external: true
-
diff --git a/docker/compose/jenkins.yaml b/docker/compose/jenkins.yaml
index d6f603a..7754052 100644
--- a/docker/compose/jenkins.yaml
+++ b/docker/compose/jenkins.yaml
@@ -15,6 +15,54 @@ services:
     networks:
       - net-public
 
+  jenkins-agent-jdk17:
+    image: jenkins-docker-agent:lts-jdk17
+    container_name: jenkins-agent-jdk17
+    depends_on:
+      - jenkins
+    volumes:
+      - temp:/tmp
+      - run:/run
+      - varrun:/var/run
+      - key:/home/jenkins/.jenkins
+      - home:/home/jenkins/agent
+      - /var/run/docker.sock:/var/run/docker.sock
+    environment:
+      - JENKINS_AGENT_SSH_PUBKEY=${pubkey}
+    networks:
+      - net-public
+
+  jenkins-agent-node18:
+    image: jenkins-docker-agent:lts-node18
+    container_name: jenkins-agent-node18
+    depends_on:
+      - jenkins
+    volumes:
+      - temp:/tmp
+      - run:/run
+      - varrun:/var/run
+      - key:/home/jenkins/.jenkins
+      - home:/home/jenkins/agent
+      - /var/run/docker.sock:/var/run/docker.sock
+    environment:
+      - JENKINS_AGENT_SSH_PUBKEY=${pubkey}
+    networks:
+      - net-public
+
 networks:
   net-public:
-    external: true
\ No newline at end of file
+    external: true
+
+volumes:
+  temp:
+    driver: local
+  run:
+    driver: local
+  varrun:
+    driver: local
+  key:
+    driver: local
+  home:
+    driver: local
+
+#pubkey=ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC/5EaeHPy5o1TJL8IomP2AjqVkivzN8RAJEiimFb2fEgdmznMcCq7hDzpFakpQC65+siDfg8BDTpwftuYe8mhkcsPeQqXlD2p8hAdC4IG6Ga1tzKy8YAKEvUR9dGcQYcwRe/VSsr2R7WEo7BxU6QYRCg1PutA82iZToBd85xpliiU9+iGSxNDLCQldvdRNCcanay4bg9vTg1VM9EkTOb3yKL988Lsv3pckB0eE4+1IF1a/LpYdrAolR39umi6qFDSlUCsoiEvBihwnC5Q0uVwAIqc5umadH0PNAvfbxOPVOIfbxdZkwiRZUk6h8gvwFillcewFJjfOCXbV2gsOAYtR9UoivN4bB2HzQzkbjS0VcSJnEBv2Qp3Xn3vXMcj1Xpgo5IOQFmicN0bo0hkXOIGEJLr1V0CqowfE05CaF4pRtDRUQKEvxRPZ94qdTeHSdfz4awdqMcjTkp4j2cAGLqRcmPFGIihoOYFZcfOaarSsR1n3UFOmfbzYWMUJEzcfrB0=
\ No newline at end of file
diff --git a/docker/dockerfile/Dockerfile-jenkins_ssh-agent_nodejs-1816 b/docker/dockerfile/Dockerfile-jenkins_ssh-agent_nodejs-1816
new file mode 100644
index 0000000..19ea85d
--- /dev/null
+++ b/docker/dockerfile/Dockerfile-jenkins_ssh-agent_nodejs-1816
@@ -0,0 +1,13 @@
+FROM jenkins/ssh-agent:latest-jdk17
+RUN apt-get update && apt-get install -y lsb-release wget
+RUN apt-get install -y ca-certificates curl gnupg lsb-release
+RUN curl -fsSLo /usr/share/keyrings/docker-archive-keyring.asc https://download.docker.com/linux/debian/gpg
+RUN echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.asc] https://download.docker.com/linux/debian $(lsb_release -cs) stable" > /etc/apt/sources.list.d/docker.list
+RUN apt-get update && apt-get install -y docker-ce-cli
+
+WORKDIR /root
+RUN curl -sL https://deb.nodesource.com/setup_18.x -o nodesource_setup.sh
+RUN bash nodesource_setup.sh
+RUN apt-get install -y nodejs
+RUN apt-get install -y build-essential
+RUN npm install -g npm@latest
\ No newline at end of file