Skip to content
Snippets Groups Projects
Commit 7a7080c6 authored by jurgenhaas's avatar jurgenhaas
Browse files

Merge branch 'develop' into 'main'

Merging develop into main

See merge request !46
parents eb7b5279 c382d202
No related branches found
No related tags found
1 merge request!46Merging develop into main
Pipeline #808355 failed
......@@ -122,6 +122,8 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
\
composer selfupdate && \
\
git config --global --add safe.directory * && \
\
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 && \
......
......@@ -18,7 +18,7 @@ if [[ "$CI_COMMIT_REF_NAME" = "" ]]; then
else
PROJECT_BRANCH=$CI_COMMIT_REF_NAME
fi
PROJECT_BRANCH_SANITIZED=$(echo "$PROJECT_BRANCH" | sed -r 's/[\/_]+/-/g')
PROJECT_BRANCH_SANITIZED=$(echo "$PROJECT_BRANCH" | tr [:upper:] [:lower:] | sed -r 's/[\/_]+/-/g')
echo "PROJECT_NAME=${PROJECT_NAME}" >>.env
echo "PROJECT_BRANCH=${PROJECT_BRANCH}" >>.env
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment