gitlab-ci-cd/drupal#28 Bug fixes

Dockerfile

@@ -54,12 +54,14 @@ 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 && \
     if [ "${ALPINE_VERSION}" = "3.12" ]; then \
-      apk add --no-cache mandoc ; \
+      apk add --no-cache mandoc py3-pip ; \
     elif [ "${ALPINE_VERSION}" = "3.15" ]; then \
-      apk add --no-cache mandoc ; \
+      apk add --no-cache mandoc py3-pip ; \
     else \
       apk add --no-cache mdocml-apropos ; \
+      python -m pip install --upgrade pip ; \
     fi && \
+    pip install semver && \
     \
     if [ "${PHP_MAJOR_VERSION}" = "7.2" ]; then \
       echo "No libiconv to install" ; \
@@ -74,14 +76,12 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
     wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${glibc_version}/glibc-${glibc_version}.apk && \
     apk add --no-cache glibc-${glibc_version}.apk && \
     rm glibc-${glibc_version}.apk && \
-    ln -s /lib/libz.so.1 /usr/glibc-compat/lib/ && \
-    ln -s /lib/libc.musl-x86_64.so.1 /usr/glibc-compat/lib && \
-    ln -s /usr/lib/libgcc_s.so.1 /lib/libgcc_s.so.1 && \
-    ln -s /lib/libgcc_s.so.1 /usr/glibc-compat/lib/ && \
-    ln -s python3 /usr/bin/python && \
-    ln -s pip3 /usr/bin/pip && \
-    python -m pip install --upgrade pip && \
-    pip install semver && \
+    ln -sf /lib/libz.so.1 /usr/glibc-compat/lib/ && \
+    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 && \
@@ -111,11 +111,11 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
     \
     composer selfupdate && \
     \
-    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 && \
-    ln -s /usr/local/bin/docker-compose /usr/local/bin/dc && \
-    ln -s /usr/local/bin/drush /usr/local/bin/d && \
+    ln -sf /usr/local/bin/ahoy /usr/local/bin/a && \
+    ln -sf /usr/local/bin/composer /usr/local/bin/c && \
+    ln -sf /usr/local/bin/docker-compose /usr/local/bin/d-c && \
+    ln -sf /usr/local/bin/docker-compose /usr/local/bin/dc && \
+    ln -sf /usr/local/bin/drush /usr/local/bin/d && \
     \
     rm -rf /var/cache/* && \
     rm -rf /root/.composer/cache

bin/merge

@@ -4,7 +4,7 @@ function gitlab() {
   output="$(curl --write-out "\nHTTP-Code:%{http_code}" -X "$2" -s -H "Private-Token: ${GITLAB_PRIVATE_TOKEN}" "${GITLAB_URL}"/api/v4/"$3" "$@")"
   result="$(echo "$output" | grep "{")"
   code="$(echo "$output" | grep -m 1 "HTTP-Code:" | cut -d: -f2)"
-  if [[ $code -eq 200 ]]; then
+  if [[ $code -eq $1 ]]; then
     return
   fi
   echo "$2 request to $3 did not succeed! Responds with code $code instead of $1"
@@ -62,6 +62,8 @@ if [[ "$host1" != "$host2" ]]; then
   echo "This repository doesn't match the provided GitLab instance"
   exit 4
 fi
+
+echo "Find project ID from remote URL ..."
 # shellcheck disable=SC2001
 path="$(echo "$path" | sed -e 's,\..*,,g')"
 gitlab 200 GET projects?search="$path"
@@ -71,8 +73,9 @@ if [[ $(isNumeric "$PRJID") -eq 1 ]]; then
   exit 5
 fi
 
+echo "Create merge request ..."
 # Create MR
-gitlab 200 POST projects/"$PRJID"/merge_requests --data "source_branch=$SOURCEBRANCH" --data "target_branch=$TARGETBRANCH" --data "title=Merging $SOURCEBRANCH into $TARGETBRANCH"
+gitlab 201 POST projects/"$PRJID"/merge_requests --data "source_branch=$SOURCEBRANCH" --data "target_branch=$TARGETBRANCH" --data "title=Merging $SOURCEBRANCH into $TARGETBRANCH"
 MRID=$(echo "$result"  | jq -r ."iid")
 if [[ $(isNumeric "$MRID") -eq 1 ]]; then
   echo "Can not create merge request"
@@ -80,6 +83,7 @@ if [[ $(isNumeric "$MRID") -eq 1 ]]; then
 fi
 echo "Created MR at $(echo "$result"  | jq -r ."web_url")"
 
+echo "Merge ..."
 # Merge MR
 gitlab 200 PUT projects/"$PRJID"/merge_requests/"$MRID"/merge --data "should_remove_source_branch=0"
 echo "Merged successfully!"