From 88236cb25ff199e722a392c993a5bc917a8fcd21 Mon Sep 17 00:00:00 2001
From: Moul <moul@moul.re>
Date: Wed, 25 Sep 2024 13:59:09 +0200
Subject: [PATCH 1/2] Fix Docker installations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
`pip` can’t be found, `python-pip` is probably not properly installed
installing `docker-compose` and `docker` from Ubuntu repositories
now available in Ubuntu 16.04 Xenial!
Image deleted as part of GitLab backup shrinking project.
Trying to rebuild the image for jobs which do not define an image to
run with
https://forum.duniter.org/t/migration-de-gitlab-doppler-vega/12459/54
---
Dockerfile | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index d5920cf..06daa7a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,10 +5,6 @@ ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update; \
apt-get install -y curl apt-transport-https ca-certificates; \
- apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D; \
- echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" > /etc/apt/sources.list.d/docker.list; \
apt-get update; \
- apt-get install -y docker-engine python-pip git; \
+ apt-get install -y docker docker-compose git; \
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-RUN pip install docker-compose
\ No newline at end of file
--
GitLab
From 2750b16f5647cfef98528cf8ea3bdbde58f376e3 Mon Sep 17 00:00:00 2001
From: Moul <moul@moul.re>
Date: Wed, 25 Sep 2024 14:16:32 +0200
Subject: [PATCH 2/2] =?UTF-8?q?Update=20.gitlab.yml=20with=20latest=20CI?=
=?UTF-8?q?=C2=A0env=20variables?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitlab-ci.yml | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 66e0591..ef532d2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,12 +14,10 @@ build_image:
services:
- docker:dind
script:
- - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY
- - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_BUILD_TAG" .
- - docker push "$CI_REGISTRY_IMAGE:$CI_BUILD_TAG"
+ - docker login -u "gitlab-ci-token" -p "$CI_JOB_TOKEN" $CI_REGISTRY
+ - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" .
+ - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
only:
- tags
tags:
- docker
-
-# simple edit to trigger this old pipeline again
\ No newline at end of file
--
GitLab