Seperated out removal of the container and images.

.gitlab-ci.yml

 # This file is a template, and might need editing before it works on your project.
 # Official docker image.
 stages:
-  - setup
+  - stop
+  - rmcontainer
+  - rmimage
   - build
 
-setup:
-  stage: setup
-  only: 
+stop-container:
+  stage: stop
+  only:
     - master
   script:
   - docker stop vesta-builds
+  allow_failure: true
+
+remove-container:
+  stage: rmcontainer
+  only:
+    - master
+  script:
   - docker rm vesta-builds
+  allow_failure: true
+
+remove-image:
+  stage: rmimage
+  only:
+    - master
+  script:
   - docker rmi yocto-base
   allow_failure: true
 
 build:
   stage: build
-  only: 
+  only:
     - master
   script:
   - docker pull ubuntu:trusty
   - docker build -t yocto-base .
   - docker run -i -v ${PWD}/artifacts:/artifacts --name vesta-builds yocto-base /bin/bash < build_script
   - ./push_artifacts.sh
-  
\ No newline at end of file
+