From be03c627e67e6bbc8f5cfb821e47e0b1a2b45221 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vegard=20Murvold=20Sporst=C3=B8l?= <vegarms@stud.ntnu.no>
Date: Sat, 27 Feb 2021 12:36:54 +0100
Subject: [PATCH] Update .gitlab-ci.yml file
---
.gitlab-ci.yml | 31 +++++++++++++++++--------------
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1d3092d..845525d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,14 @@
-# This file is a template, and might need editing before it works on your project.
-docker-build-master:
- # Official docker image.
+stages:
+ - test
+ - build
+ - deploy
+
+test:
+ stage: test
+ script:
+ - ECHO "Test something"
+
+docker-build:
image: docker:latest
stage: build
services:
@@ -13,16 +21,11 @@ docker-build-master:
only:
- master
-docker-build:
- # Official docker image.
- image: docker:latest
- stage: build
+deploy:
+ stage: deploy
services:
- - docker:dind
- before_script:
- - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+ - docker:dind
script:
- - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
- - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
- except:
- - master
+ - docker login --email=_ --username=_ --password=<$HEROKU_TOKEN> registry.heroku.com
+ - docker tag registry.gitlab.stud.idi.ntnu.no/vegarms/tdt4242-base:latest registry.gitlab.stud.idi.ntnu.no/vegarms/tdt4242-base
+ - docker push registry.gitlab.stud.idi.ntnu.no/vegarms/tdt4242-base
--
GitLab