From 257e889b0aa375f6ac57a6c07083a41fc02f29aa Mon Sep 17 00:00:00 2001
From: 30hours <nathan@30hours.dev>
Date: Fri, 16 Feb 2024 02:34:52 +0000
Subject: [PATCH] Update Jenkins with env and Dockerfile labels

---
 Dockerfile     |  1 +
 Jenkinsfile    | 25 +++++++++++--------------
 api/Dockerfile |  3 +++
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4c9b80f..30c6e9b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,6 @@
 FROM ubuntu:22.04 as blah2_env
 LABEL maintainer="30hours <nathan@30hours.dev>"
+LABEL org.opencontainers.image.source https://github.com/30hours/blah2
 
 WORKDIR /blah2
 ADD lib lib
diff --git a/Jenkinsfile b/Jenkinsfile
index d9004e5..dab8ebc 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,8 +3,9 @@ pipeline {
 
     environment {
         GHCR_REGISTRY = "ghcr.io"
-        GHCR_USERNAME = credentials('30hours')
         GHCR_TOKEN = credentials('ghcr-login')
+        BLAH2_NAME = "30hours/blah2"
+        BLAH2_API_NAME = "30hours/blah2_api"
     }
 
     stages {
@@ -15,11 +16,9 @@ pipeline {
         }
         stage('Build') {
             steps {
-                script {
-                    echo 'Building the project'
-                    blah2 = docker.build("30hours/blah2", "--file ./Dockerfile .")
-                    blah2_api = docker.build("30hours/blah2", "--file ./api/Dockerfile ./api")
-                }
+                echo 'Building the project'
+                sh 'docker build -t $BLAH2_NAME .'
+                sh 'docker build -t $BLAH2_API_NAME --file ./api/Dockerfile ./api'
             }
         }
         stage('Test') {
@@ -29,14 +28,12 @@ pipeline {
         }
         stage('Push') {
             steps {
-                script {
-                    echo 'Pushing the application'
-
-                    docker.withRegistry("${GHCR_REGISTRY}", "${GHCR_TOKEN}") {
-                        blah2.push()
-                        blah2_api.push()
-                    }
-                }
+                sh 'echo $GHCR_TOKEN_PSW | docker login ghcr.io -u $GHCR_TOKEN_USR --password-stdin'
+                sh 'docker tag $BLAH2_NAME ghcr.io/$BLAH2_NAME'
+                sh 'docker tag $BLAH2_API_NAME ghcr.io/$BLAH2_API_NAME'
+                sh 'docker push ghcr.io/$BLAH2_NAME'
+                sh 'docker push ghcr.io/$BLAH2_API_NAME'
+                sh 'docker logout'
             }
         }
     }
diff --git a/api/Dockerfile b/api/Dockerfile
index ee557f5..f2f2ecf 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -1,5 +1,8 @@
 FROM node:16
 
+LABEL maintainer="30hours <nathan@30hours.dev>"
+LABEL org.opencontainers.image.source https://github.com/30hours/blah2
+
 # Create app directory
 WORKDIR /usr/src/app