gitlab-foss | GitLab FOSS is a read-only mirror of GitLab | Collaboration library

On a daily basis I am working with GitLab with following workflow:

1. I create a new feature branch from main branch
2. I commit and push changes to the feature branch
3. Then I create a new merge request (from feature into main) via GitLab GUI using squash feature:
4. When approver accept my MR, it results with following main branch tree (from IntellJ IDEA):

I have tried to achieve the same on my testing repository using command line only but with no success so far. I have tried (on feature branch) interactive rebase as well as soft reset with force push but it always results as a 'single line tree'. Example after two separate merges from feature into main:

I am trying to build a Gitlab CI yml, that triggers a certain job:

• when the commit is tagged in the form x.y.z
• I trigger manually via the Gitlab webapp
• the commit message ends with a certain regex ("-build_doc")

with the bullets being logical or statements. I tried only statements and rules alike but couldn't figure it out. Web and tag already worked like so:

I would like to create a pipeline that is only run if both of the following conditions are met:

• A tag refers to the given commit
• The commit exists on any protected branch (i.e. master)
• Optional: The job should be run whenever a tagged unprotected branch is merge (with a merge request) into a protected branch or if a tag is added to a protected branch.

I've tried:

I am getting the 502 Whoops, GitLab is taking too much time to respond error on my fresh Manual installation of Gitlab-ce 13.2.4 on CENTOS 8 (nginx/1.16.1).

I downloaded the rpm gitlab-ce-13.2.4-ce.0.el8.x86_64.rpm

• dnf -y install policycoreutils-python-utils
• rpm -Uvh gitlab-ce-13.2.4-ce.0.el8.x86_64.rpm
• /etc/gitlab/gitlab.rb >> external_url "https://git.mydomain.com"
• /etc/gitlab/gitlab.rb >> nginx['enable'] = false
• /etc/gitlab/gitlab.rb >> web_server['external_users'] = ['nginx']
• /etc/gitlab/gitlab.rb >> gitlab_rails['trusted_proxies'] = [ '172.16.1.0/24', '192.168.10.0/24']
• /etc/nginx/conf.d/git.mydomain.com.conf >> https://gitlab.com/gitlab-org/gitlab-foss/-/raw/master/lib/support/nginx/gitlab-ssl
• systemctl restart nginx
• gitlab-ctl reconfigure

My git.mydomain.com.conf

I have dotnet solution which consists of console project, webapi project and mysql db. I put them in separate docker images, wrote docker-compose to start and tested on my machine. Next, I wrote a test using FluentDocker, which allows me to start docker-compose programmatically and verify that containers are up and running.

Now I want to do this on Gitlab CI. Previously I used image: mcr.microsoft.com/dotnet/core/sdk:3.1 and run test stage against test project. It worked fine because there was no docker integration. I cant run FluentDocker test on Gitlab CI because the image does not contain docker. So I started researching.

1. Solution to incorporate db in CI job is here https://docs.gitlab.com/ee/ci/docker/using_docker_images.html#what-is-a-service , but I doubt that I can use docker as service.

2. Next is using docker intergration for gitlab runner https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#use-docker-in-docker-workflow-with-docker-executor or https://tomgregory.com/running-docker-in-docker-on-windows/ I cant use that because I use free runner from Gitlab itself and cant configure it. I tried to run docker info command, it fails in my script.

3. I thought of building my own image based on dotnet sdk with docker included, but it seems like a bad idea. And I did not make it working in the end.

4. Solution that seems working is to use dind and start docker-compose: How to run docker-compose inside docker in docker which runs inside gitlab-runner container? or https://gitlab.com/gitlab-org/gitlab-foss/-/issues/30426 But to use it I will need to install dotnet-sdk to build and test my app in before-script section, and sdk is not a small package to download each time.

5. I can try to build my image based on docker:dind and include dotnet sdk there, publish it on dockerhub then use it in gitlab runner. Now it seems to me as the last option.

So, whats the correct approach here?

-----------edit--------------

I made this working! See the very thorough answer from Konrad Botor with dockerfile and yml file. I built my own image with sdk and docker and used it for test stage with dind service linked. My image is hosted on dockerhub, so gitlab downloads it for usage.

Also some notes:

1 - how to use dind as service https://gitlab.com/gitlab-org/gitlab-runner/-/issues/25344

2 - where to get modprobe.sh and docker-entrypoint.sh https://github.com/docker-library/docker (go inside latest release). Very important is to clone repo and copy files from there, because I tried to copy-paste contents and it did not work.

3 - docker-compose repo https://github.com/tmaier/docker-compose/blob/master/Dockerfile

4 - dind example https://gitlab.com/gitlab-examples/docker/-/blob/master/.gitlab-ci.yml

We have on premise Gitlab installation and want to display big diffs. According to comments from this issue https://gitlab.com/gitlab-org/gitlab-foss/issues/30061 we made following changes

In my GitLab CI build, I want to:

• Start a docker container with local AmazonDB. Standard port layout: port 8000 in docker, port 8000 exposed. Of course, everything works locally, I can connect (curl, awc-cli, Java code for Amazon DB, whatever you wish).
• Use it for tests, i.e. connect to it as --endpoint-url http://localhost:8000 (or any other mapped IP instead of localhost).

.gitlab-ci.yml looks like this: