From 73e40980de0b395149eb643e5e0fbcd0eae94427 Mon Sep 17 00:00:00 2001
From: vesem <mitch@nerdfortress.dev>
Date: Fri, 6 Aug 2021 06:48:42 -0400
Subject: [PATCH] Updates to dockerfile

---
 Jenkinsfile        | 16 ++++++++--------
 docker-compose.yml | 24 ++++++++++++------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 425a8c2c..0f196b13 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -34,18 +34,18 @@ node {
             archiveArtifacts artifacts: '**/target/*.jar', fingerprint: true
         }
 
-        stage("Prepare for containerizing") {
-            withCredentials([file(credentialsId: 'privatekey', variable: 'privateKey'),
-                             file(credentialsId: 'publickey', variable: 'publicKey')]){
-                sh "cp \$privateKey ./"
-                sh "cp \$publicKey ./"
-            }
-        }
+//        stage("Prepare for containerizing") {
+//            withCredentials([file(credentialsId: 'privatekey', variable: 'privateKey'),
+//                             file(credentialsId: 'publickey', variable: 'publicKey')]){
+//                sh "cp \$privateKey ./"
+//                sh "cp \$publicKey ./"
+//            }
+//        }
         stage("Run docker compose") {
             sh "docker-compose build"
             withCredentials([usernamePassword(credentialsId: 'doApi', passwordVariable: 'doApi', usernameVariable: '')]) {
                 sh "docker login -u \$doApi -p \$doApi registry.digitalocean.com"
-                sh "docker push registry.digitalocean.com/nerdfortress/crusadetracker_nginx"
+//                sh "docker push registry.digitalocean.com/nerdfortress/crusadetracker_nginx"
                 sh "docker push registry.digitalocean.com/nerdfortress/crusadetracker"
             }
         }
diff --git a/docker-compose.yml b/docker-compose.yml
index a493f26f..08670058 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,17 +1,17 @@
 version: '2'
 services:
-  nginx:
-    restart: always
-    build:
-      context: .
-      dockerfile: nginx.dockerfile
-    image: registry.digitalocean.com/nerdfortress/crusadetracker_nginx
-    expose:
-      - '80'
-      - '443'
-    ports:
-      - '80:80'
-      - '443:443'
+#  nginx:
+#    restart: always
+#    build:
+#      context: .
+#      dockerfile: nginx.dockerfile
+#    image: registry.digitalocean.com/nerdfortress/crusadetracker_nginx
+#    expose:
+#      - '80'
+#      - '443'
+#    ports:
+#      - '80:80'
+#      - '443:443'
   crusadetracker-app:
     restart: always
     container_name: crusadetracker