From 6c74b6119cd44c918fda1ed1690564aa86f3f585 Mon Sep 17 00:00:00 2001
From: Vincent Texier <vit@free.fr>
Date: Tue, 18 Jan 2022 17:26:15 +0100
Subject: [PATCH] remove platform repository
---
.gitlab-ci.yml | 16 ++++++----------
ubuntu-18.04/Dockerfile => Dockerfile | 0
ubuntu-18.04/startx.sh => startx.sh | 0
3 files changed, 6 insertions(+), 10 deletions(-)
rename ubuntu-18.04/Dockerfile => Dockerfile (100%)
rename ubuntu-18.04/startx.sh => startx.sh (100%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2f59381..c62ca7b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,11 +5,11 @@
# services:
# - docker:dind
# script:
-# - docker build ubuntu-18.04
+# - docker build .
# except:
# - tags
-.build_image:
+build_image:
image: docker:git
tags:
- docker
@@ -17,15 +17,11 @@
- docker:dind
script:
- docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY
- - docker build --pull -t "$CI_REGISTRY_IMAGE/$PLATFORM:$CI_BUILD_TAG" $PLATFORM
+ - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_BUILD_TAG" $PLATFORM
- docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY
- - docker push "$CI_REGISTRY_IMAGE/$PLATFORM:$CI_BUILD_TAG"
- - docker tag "$CI_REGISTRY_IMAGE/$PLATFORM:$CI_BUILD_TAG" "$CI_REGISTRY_IMAGE/$PLATFORM:latest"
- - docker push "$CI_REGISTRY_IMAGE/$PLATFORM:latest"
+ - docker push "$CI_REGISTRY_IMAGE:$CI_BUILD_TAG"
+ - docker tag "$CI_REGISTRY_IMAGE:$CI_BUILD_TAG" "$CI_REGISTRY_IMAGE:latest"
+ - docker push "$CI_REGISTRY_IMAGE:latest"
only:
- tags
-build_ubuntu-18.04:
- extends: .build_image
- variables:
- PLATFORM: "ubuntu-18.04"
diff --git a/ubuntu-18.04/Dockerfile b/Dockerfile
similarity index 100%
rename from ubuntu-18.04/Dockerfile
rename to Dockerfile
diff --git a/ubuntu-18.04/startx.sh b/startx.sh
similarity index 100%
rename from ubuntu-18.04/startx.sh
rename to startx.sh
--
GitLab