ci(scripts): add docker registry

Tux-Inc · Nov 29, 2023 · 6ff90bb · 6ff90bb
1 parent 8afa6fb
commit 6ff90bb
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/helm/whanos/values.yaml b/helm/whanos/values.yaml
@@ -93,3 +93,6 @@ jenkins:
       - type: HostPath
         hostPath: /whanos
         mountPath: /whanos
+    envVars:
+      - name: DOCKER_REGISTRY
+        value: "whanos-docker-registry:5000"
diff --git a/jenkins/job_dsl.groovy b/jenkins/job_dsl.groovy
@@ -38,13 +38,13 @@ languages.each { language ->
 
 freeStyleJob("Whanos base images/Build all base images") {
     steps {
+        shell('''
+            cp -r /whanos/scripts/install_dockercli.sh .
+            chmod -R 777 install_dockercli.sh
+            ls -la
+            sh -c "./install_dockercli.sh"
+        ''')
         languages.each { language ->
-            shell('''
-                cp -r /whanos/scripts/install_dockercli.sh .
-                chmod -R 777 install_dockercli.sh
-                ls -la
-                sh -c "./install_dockercli.sh"
-            ''')
             shell("docker build /whanos/images/$language -t whanos-$language -f /whanos/images/$language/Dockerfile.base")
         }
     }
@@ -81,7 +81,7 @@ freeStyleJob("link-project") {
                             cp -r /whanos/scripts/* .
                             chmod -R 777 .
                             ls -la
-                            sh -c "./whanos.sh"
+                            sh -c "./whanos.sh \\\"DISPLAY_NAME\\\""
                         \'\'\')
                     }
                 }

diff --git a/scripts/build_image.sh b/scripts/build_image.sh
@@ -1,14 +1,17 @@
 #!/bin/bash
 LANGUAGE=$1
+NAME=$2
+
+image_name=$DOCKER_REGISTRY/whanos/whanos-$NAME-$LANGUAGE
 
 if [[ -f Dockerfile ]]; then
-	docker build . -t $image_name
+	docker build . -t "$image_name"
 else
 	docker build . \
-		-f /images/${LANGUAGE}/Dockerfile.standalone \
-		-t $image_name
+		-f /images/"${LANGUAGE}"/Dockerfile.standalone \
+		-t "$image_name"
 fi
 
-if ! docker push $image_name; then
+if ! docker push "$image_name"; then
 	exit 1
 fi
diff --git a/scripts/whanos.sh b/scripts/whanos.sh
@@ -1,3 +1,5 @@
+DISPLAY_NAME=$1
+
 # Install docker-cli
 ./install_dockercli.sh
 if [ $? -ne 0 ]; then
@@ -16,7 +18,7 @@ fi
 language=$(./detect_language.sh)
 
 # Execute build_image.sh script with the output of detect_language.sh as argument
-./build_image.sh "$language"
+./build_image.sh "$language" "$DISPLAY_NAME"
 if [ $? -ne 0 ]; then
   echo "build_image.sh failed"
   exit 1