From 402410ee10c9aa82a1b3b6bd942a390480b4afc0 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Fri, 13 May 2022 16:56:25 +0200
Subject: [PATCH] ansible-inventories/bitegra#21 Rename master to main
---
.gitlab-ci.yml | 2 +-
Dockerfile | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3a5d238..02501e8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,4 +26,4 @@ php:
- docker build --pull --build-arg ALPINE_VERSION=${ALPINE} --build-arg PHP_MAJOR_VERSION=${PHP} --build-arg VERSION=${VERSION} -t $CI_REGISTRY_IMAGE:php-${PHP} .
- docker push $CI_REGISTRY_IMAGE:php-${PHP}
only:
- - master
+ - main
diff --git a/Dockerfile b/Dockerfile
index ed7f70a..a11041e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -109,6 +109,9 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
\
composer selfupdate && \
\
+ python -m pip install --upgrade pip && \
+ pip install --upgrade python-gitlab pyyaml && \
+ \
ln -s /usr/local/bin/ahoy /usr/local/bin/a && \
ln -s /usr/local/bin/composer /usr/local/bin/c && \
ln -s /usr/local/bin/docker-compose /usr/local/bin/d-c && \
--
GitLab