Updates to dockerfile

This commit is contained in:
vesem 2021-08-06 06:48:42 -04:00
parent 20ff4b4a44
commit 73e40980de
2 changed files with 20 additions and 20 deletions

16
Jenkinsfile vendored
View File

@ -34,18 +34,18 @@ node {
archiveArtifacts artifacts: '**/target/*.jar', fingerprint: true archiveArtifacts artifacts: '**/target/*.jar', fingerprint: true
} }
stage("Prepare for containerizing") { // stage("Prepare for containerizing") {
withCredentials([file(credentialsId: 'privatekey', variable: 'privateKey'), // withCredentials([file(credentialsId: 'privatekey', variable: 'privateKey'),
file(credentialsId: 'publickey', variable: 'publicKey')]){ // file(credentialsId: 'publickey', variable: 'publicKey')]){
sh "cp \$privateKey ./" // sh "cp \$privateKey ./"
sh "cp \$publicKey ./" // sh "cp \$publicKey ./"
} // }
} // }
stage("Run docker compose") { stage("Run docker compose") {
sh "docker-compose build" sh "docker-compose build"
withCredentials([usernamePassword(credentialsId: 'doApi', passwordVariable: 'doApi', usernameVariable: '')]) { withCredentials([usernamePassword(credentialsId: 'doApi', passwordVariable: 'doApi', usernameVariable: '')]) {
sh "docker login -u \$doApi -p \$doApi registry.digitalocean.com" 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" sh "docker push registry.digitalocean.com/nerdfortress/crusadetracker"
} }
} }

View File

@ -1,17 +1,17 @@
version: '2' version: '2'
services: services:
nginx: # nginx:
restart: always # restart: always
build: # build:
context: . # context: .
dockerfile: nginx.dockerfile # dockerfile: nginx.dockerfile
image: registry.digitalocean.com/nerdfortress/crusadetracker_nginx # image: registry.digitalocean.com/nerdfortress/crusadetracker_nginx
expose: # expose:
- '80' # - '80'
- '443' # - '443'
ports: # ports:
- '80:80' # - '80:80'
- '443:443' # - '443:443'
crusadetracker-app: crusadetracker-app:
restart: always restart: always
container_name: crusadetracker container_name: crusadetracker