From ca970c62a7888f1bcd316b38eff204c45171c36c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pernille=20N=C3=B8dtvedt=20Welle-Watne?=
<1417-pernilnw@users.noreply.gitlab.stud.idi.ntnu.no>
Date: Tue, 23 Feb 2021 15:52:38 +0100
Subject: [PATCH] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2603976..906b2fe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,21 +16,21 @@ test:
- pip install -r requirements.txt
- python manage.py test
-build_image:
- only:
- - master
- image: registry.gitlab.com/majorhayden/container-buildah
+image:
+ name: docker/compose:latest
+services:
+ - docker:dind
+
+before_script:
+ - docker version
+ - docker-compose version
+
+build:
+
stage: build
- variables:
- STORAGE_DRIVER: "vfs"
- BUILDAH_FORMAT: "docker"
- before_script:
- - dnf install -y nodejs
- - curl https://cli-assets.heroku.com/install.sh | sh
- - sed -i "/^mountopt =.*/d" /etc/containers/storage.conf
script:
- - buildah bud --iidfile iidfile -t rust-python-demo:$CI_COMMIT_SHORT_SHA .
- - buildah push --creds=_:$(heroku auth:token) $(cat iidfile) registry.heroku.com/tdt4242-base/web
+ - apk add --no-cache docker-compose
+ - docker-compose up -d
release:
only:
--
GitLab