From 69a5093634080b251ba94308f8b9eb9c5ecdda18 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Mon, 30 May 2022 17:11:16 +0200
Subject: [PATCH] gitlab-ci-cd/drupal#28 Bug fixes
---
Dockerfile | 4 ++--
bin/merge | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index fd6b93b..0336c01 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -53,6 +53,8 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
\
apk update && \
apk add --no-cache openssh wget make patch bash fish zsh python3 git git-lfs unzip acl libpng-dev libzip-dev sudo jq nano rsync && \
+ ln -sf python3 /usr/bin/python && \
+ ln -sf pip3 /usr/bin/pip && \
if [ "${ALPINE_VERSION}" = "3.12" ]; then \
apk add --no-cache mandoc py3-pip ; \
elif [ "${ALPINE_VERSION}" = "3.15" ]; then \
@@ -80,8 +82,6 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
ln -sf /lib/libc.musl-x86_64.so.1 /usr/glibc-compat/lib && \
ln -sf /usr/lib/libgcc_s.so.1 /lib/libgcc_s.so.1 && \
ln -sf /lib/libgcc_s.so.1 /usr/glibc-compat/lib/ && \
- ln -sf python3 /usr/bin/python && \
- ln -sf pip3 /usr/bin/pip && \
\
wget -q https://github.com/ahoy-cli/ahoy/releases/download/${AHOY_VERSION}/ahoy-bin-`uname -s`-amd64 -O /usr/local/bin/ahoy && \
chmod +x /usr/local/bin/ahoy && \
diff --git a/bin/merge b/bin/merge
index 8a66441..5e9cb5f 100755
--- a/bin/merge
+++ b/bin/merge
@@ -1,7 +1,9 @@
#!/bin/bash
function gitlab() {
+ echo " sending request ..."
output="$(curl --write-out "\nHTTP-Code:%{http_code}" -X "$2" -s -H "Private-Token: ${GITLAB_PRIVATE_TOKEN}" "${GITLAB_URL}"/api/v4/"$3" "$@")"
+ echo " done"
result="$(echo "$output" | grep "{")"
code="$(echo "$output" | grep -m 1 "HTTP-Code:" | cut -d: -f2)"
if [[ $code -eq $1 ]]; then
--
GitLab