From b4f4afb33bf0767e7aa94163a8447ad4dd92d845 Mon Sep 17 00:00:00 2001
From: Alexey Kuklin <alex@kuklin.eu>
Date: Sun, 20 Dec 2020 07:18:33 +0200
Subject: [PATCH] use include in ci
---
.gitlab-ci.yml | 47 ++++-------------------------------------------
Dockerfile | 2 ++
2 files changed, 6 insertions(+), 43 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 92664b3..0cbe59f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,48 +1,9 @@
-stages:
-- build
-- manifest
+include:
+ - project: 'code/ci-template'
+ file: '/go/base.yml'
-variables:
- DOCKER_CONFIG: ~/.docker/$CI_JOB_ID
-
-before_script:
- - "[ -d $DOCKER_CONFIG ] || mkdir -p $DOCKER_CONFIG"
- - "echo '{ \"experimental\": \"enabled\" }' > $DOCKER_CONFIG/config.json"
- - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-
-after_script:
- - "rm -vRf $DOCKER_CONFIG"
-
-ppc64le:
- variables:
- IMAGE: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_JOB_NAME:$CI_COMMIT_REF_NAME
- stage: build
- tags:
- - ppc64le-docker
+.build:
script:
- docker build --build-arg GITLAB_LOGIN=gitlab-ci-token --build-arg GITLAB_PASSWORD=$CI_JOB_TOKEN --pull -t $IMAGE -f Dockerfile .
- docker push $IMAGE
-amd64:
- variables:
- IMAGE: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_JOB_NAME:$CI_COMMIT_REF_NAME
- stage: build
- tags:
- - amd64-docker
- script:
- - docker build --build-arg GITLAB_LOGIN=gitlab-ci-token --build-arg GITLAB_PASSWORD=$CI_JOB_TOKEN --pull -t $IMAGE -f Dockerfile .
- - docker push $IMAGE
-
-manifest:
- variables:
- IMAGE: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
- IMAGE_amd64: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/amd64:$CI_COMMIT_REF_NAME
- IMAGE_ppc64le: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/ppc64le:$CI_COMMIT_REF_NAME
- stage: manifest
- tags:
- - amd64-docker
- script:
- - docker manifest create $IMAGE $IMAGE_amd64 $IMAGE_ppc64le
- - docker manifest push $IMAGE
-
-
diff --git a/Dockerfile b/Dockerfile
index 558c70e..fb1584a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,4 +5,6 @@ apt-get clean autoclean && \
apt-get autoremove --yes && \
rm -rf /var/lib/{apt,dpkg,cache,log}
+WORKDIR /srv
+
--
GitLab