Bladeren bron

Add deployment stage

maxep 7 jaren geleden
bovenliggende
commit
2b25dfcb35
3 gewijzigde bestanden met toevoegingen van 21 en 8 verwijderingen
  1. 4 7
      Jenkinsfile
  2. 16 0
      docker-compose.yml
  3. 1 1
      themes/default/index.html

+ 4 - 7
Jenkinsfile

@@ -3,15 +3,12 @@ node (label: 'docker') {
 
 	stage('Build') {
 		checkout scm
-		sh 'docker run --rm --volume="$PWD:/srv/jekyll" jekyll/builder jekyll build'
+		sh 'mkdir -p _site && docker run --rm --volume="$PWD":/srv/jekyll jekyll/builder jekyll build'
         app = docker.build("maxep/mikee")
     }
-	
-	stage('Push Image') {
-        docker.withRegistry('https://registry.hub.docker.com', 'docker-hub-credentials') {
-            app.push("${env.BUILD_NUMBER}")
-            app.push("latest")
-        }
+
+    stage('Deploy') {
+        sh 'docker-compose up -d'
 		sh 'docker image prune -a -f'
     }
 }

+ 16 - 0
docker-compose.yml

@@ -0,0 +1,16 @@
+version: '3'
+
+services:
+  owncloud:
+    image: maxep/mikee
+    container_name: mikee
+    restart: unless-stopped
+    environment:
+      - VIRTUAL_HOST=mikee.maxep.me
+      - LETSENCRYPT_HOST=mikee.maxep.me
+      - LETSENCRYPT_EMAIL=maxime.epain@gmail.com
+
+networks:
+  default:
+    external:
+      name: proxy

+ 1 - 1
themes/default/index.html

@@ -48,7 +48,7 @@
       {% if site.app.appetize_key %}
         <div class="device appetize">
           <div class="frame"></div>
-          <iframe src="https://appetize.io/embed/{{ site.app.appetize_key }}?autoplay=false&useLastFrame=true&orientation=portrait&deviceColor=black&screenOnly=true&disableHome=true&device=iphonex&scale=100" frameborder="0" scrolling="no"></iframe>
+          <iframe src="https://appetize.io/embed/{{ site.app.appetize_key }}?autoplay=true&useLastFrame=true&orientation=portrait&deviceColor=black&screenOnly=true&disableHome=true&device=iphonex&scale=100" frameborder="0" scrolling="no"></iframe>
         </div>
       {% endif %}
       </div>