From c8db1f8d16f7000cd2d8d225e932d85ac22e5247 Mon Sep 17 00:00:00 2001
From: Andrew Kapuscinski <akapusci@nrao.edu>
Date: Fri, 20 Nov 2020 10:32:40 -0700
Subject: [PATCH] added dev image build and push steps for gitlab-ci
---
.gitlab-ci.yml | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9830cdc5f..7534fbf59 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,8 @@ stages:
workflow:
rules:
+ - if: $CI_COMMIT_MESSAGE =~ /\A(?i)-wip/
+ when: never
- if: '$CI_PIPELINE_SOURCE == "push"'
image: docker:19.03.12
@@ -15,10 +17,20 @@ services:
- name: docker:19.03.12-dind
before_script:
- - docker info
- echo "$HARBOR_PASSWORD" | docker login -u "$HARBOR_USER" --password-stdin $HARBOR_URL
-build dev:
+build dev workflow:
stage: build-dev
script:
- - docker build -t workspace:gitlab-test -f services/workflow/Dockerfile.dev .
+ - docker build -t marconi.aoc.nrao.edu/workspaces/workflow:$CI_COMMIT_BRANCH -f services/workflow/Dockerfile.dev .
+ - docker tag marconi.aoc.nrao.edu/workspaces/workflow:$CI_COMMIT_BRANCH marconi.aoc.nrao.edu/workspaces/workflow:$CI_COMMIT_SHORT_SHA
+ - docker push marconi.aoc.nrao.edu/workspaces/workflow:$CI_COMMIT_SHORT_SHA
+ - docker push marconi.aoc.nrao.edu/workspaces/workflow:$CI_COMMIT_BRANCH
+
+build dev capability:
+ stage: build-dev
+ script:
+ - docker build -t marconi.aoc.nrao.edu/workspaces/capability:$CI_COMMIT_BRANCH -f services/capability/Dockerfile.dev .
+ - docker tag marconi.aoc.nrao.edu/workspaces/capability:$CI_COMMIT_BRANCH marconi.aoc.nrao.edu/workspaces/capability:$CI_COMMIT_SHORT_SHA
+ - docker push marconi.aoc.nrao.edu/workspaces/capability:$CI_COMMIT_SHORT_SHA
+ - docker push marconi.aoc.nrao.edu/workspaces/capability:$CI_COMMIT_BRANCH
--
GitLab