Merge conflict

awesomebytes · Mar 9, 2020 · 02ac135 · 02ac135
2 parents c6c80be + 1f81013
commit 02ac135
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -9,13 +9,12 @@ jobs:
       docker_image_name: pepper_os_image
 
     steps:
-    - script: docker login -u $(DockerHub_user) -p $(DockerHub_password)
-      displayName: 'docker login'
-    # We divide the boostrap in 3 parts to not go over the 6h limit as gcc takes ages
     - script: docker build --network host -f Dockerfile -t $(DockerHub_user)/$(docker_image_name):$(Build.BuildId) .
       displayName: 'docker build'
       # This means up to 6h
       timeoutInMinutes: 0
+    - script: docker login -u $(DockerHub_user) -p $(DockerHub_password)
+      displayName: 'docker login'
       # Even if it fails I want to push the image to DockerHub for inspection
     # The variables are set on the Build options on the web interface
     # # Try to tag the latest failed image we ran