Differences

This shows you the differences between two versions of the page.

--- инструмент_gitlab [2026/02/16 06:35]
val [Проверка конфигурации и перезапуск]
+++ инструмент_gitlab [2026/04/10 17:37] (current)
val [Пример CI с использованием контейнеров]
@@ Line 58: / Line 58: @@
         gitlab_rails['registry_port'] = "5050"
         registry['registry_http_addr'] = "0.0.0.0:5050"
+        #gitlab_rails['env'] = { 'SKIP_RAISE_ON_INITIALIZE_CONNECTIONS' => 'true' }
     ports:
       - '443:443'
@@ Line 109: / Line 110: @@
 sudo -i
-export BR=main; bash <(curl -s http://gate.corp13.un/api/v4/projects/1/repository/files/start.sh/raw?ref=$BR)
+export BR=main; bash <(curl -s http://gate.corpX.un/api/v4/projects/1/repository/files/start.sh/raw?ref=$BR)
 </code>
@@ Line 119: / Line 120: @@
 <code>
-kube1:~/gitlab# cat adduser.sh
+client1$ cat adduser.sh
 </code><code>
 GITLAB_URL="https://gitlab.corpX.un"
-PRIVATE_TOKEN="NNNNNNNNNNNN"
+PRIVATE_TOKEN=NNNNNNNNNNNN
 USER_EMAIL="user1@corpX.un"
@@ Line 155: / Line 156: @@
 # ###gitlab-rake gitlab:check
 # ###gitlab-ctl tail sidekiq
-# ###head -n2 /etc/gitlab/gitlab.rb
-gitlab_rails['env'] = { 'SKIP_RAISE_ON_INITIALIZE_CONNECTIONS' => 'true' }
 # gitlab-ctl show-config
@@ Line 299: / Line 298: @@
   * [[https://docs.gitlab.com/runner/install/linux-manually.html|Install GitLab Runner manually on GNU/Linux]]
-  * [[https://val.bmstu.ru/unix/Git/gitlab-runner_amd64.deb]] (16.10.0)
+  * [[https://val.bmstu.ru/unix/Git/gitlab-runner_amd64.deb]] (17.3.1-1)
 <code>
@@ Line 307: / Line 306: @@
 ## Может занять 2 часа ##
-# ###curl -LJO "https://s3.dualstack.us-east-1.amazonaws.com/gitlab-runner-downloads/latest/deb/gitlab-runner-helper-images.deb"
+# ###curl -LJO "https://s3.dualstack.us-east-1.amazonaws.com/gitlab-runner-downloads/v18.6.2/deb/gitlab-runner-helper-images.deb"
-# ###curl -LJO "https://s3.dualstack.us-east-1.amazonaws.com/gitlab-runner-downloads/latest/deb/gitlab-runner_amd64.deb"
+# ###curl -LJO "https://s3.dualstack.us-east-1.amazonaws.com/gitlab-runner-downloads/v18.6.2/deb/gitlab-runner_amd64.deb"
 # ###dpkg -i gitlab-runner-helper-images.deb gitlab-runner_amd64.deb
 </code>
@@ Line 365: / Line 364: @@
   -v /srv/gitlab-runner/config:/etc/gitlab-runner \
   -v /var/run/docker.sock:/var/run/docker.sock \
-  gitlab/gitlab-runner:latest
+  gitlab/gitlab-runner:v18.6.2
 </code>
@@ Line 373: / Line 372: @@
 <code>
-gate:~# docker run --rm -v /srv/gitlab-runner/config:/etc/gitlab-runner gitlab/gitlab-runner register \
+gate:~# docker run --rm -v /srv/gitlab-runner/config:/etc/gitlab-runner gitlab/gitlab-runner:v18.6.2 register \
   --non-interactive \
   --url "http://server.corpX.un/" \
@@ Line 388: / Line 387: @@
 <code>
-gate:~# docker run --rm -v /srv/gitlab-runner/config:/etc/gitlab-runner gitlab/gitlab-runner register \
+gate:~# docker run --rm -v /srv/gitlab-runner/config:/etc/gitlab-runner gitlab/gitlab-runner:v18.6.2 register \
   --non-interactive \
   --url "http://server.corpX.un/" \
@@ Line 404: / Line 403: @@
 === TLS для DooD и DinD ===
 <code>
-# cp wild.crt /srv/gitlab-runner/config/
+server# scp /opt/freeipa-data/etc/ipa/ca.crt client1:/srv/gitlab-runner/config/
-docker run --rm -v /srv/gitlab-runner/config:/etc/gitlab-runner gitlab/gitlab-runner register \
+client1# docker run --rm -v /srv/gitlab-runner/config:/etc/gitlab-runner gitlab/gitlab-runner:v18.6.2 register \
 ...
-  --url "https://server.corpX.un/" \
+  --url "https://gitlab.corpX.un/" \
-  --tls-ca-file "/etc/gitlab-runner/wild.crt" \
+  --tls-ca-file "/etc/gitlab-runner/ca.crt" \
 ...
 </code>
@@ Line 679: / Line 678: @@
 #  - prebuildtest
   - build
+#  - scan
 #  - test
   - push
@@ Line 710: / Line 710: @@
       --pull
       --cache-from $CI_REGISTRY_IMAGE:latest
-      --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
+      --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA .
-      .
     - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
@@ Line 772: / Line 771: @@
 #  except:
 #    - tags
+#  tags:
+#    - build
+#semgrep:
+#  stage: lint
+#  image: semgrep/semgrep
+#  script: semgrep --config=auto --error
+#  variables:
+#    SEMGREP_SRC_DIRECTORY: $CI_PROJECT_DIR
+#    #https_proxy: http://gate.isp.un:3128/
+#    #no_proxy: localhost,127.0.0.1,isp.un,corpX.un
+#  except:
+#    - tags
+#  tags:
+#    - build
+#Unit test:
+#  stage: prebuildtest
+#  script:
+#    - export PYTHON_KEYRING_BACKEND=keyring.backends.null.Keyring
+#    - poetry install
+#    - poetry run python3 -m unittest
+#  except:
+#    - tags
+#  tags:
+#    - build
 #Smoke test:
@@ Line 782: / Line 807: @@
 #  except:
 #    - tags
+#  tags:
+#    - build
-#Unit test:
+#trivy:
-#  stage: prebuildtest
+#  stage: scan
+#  image:
+#    name: ghcr.io/aquasecurity/trivy
+#    entrypoint: [""]
+#  variables:
+#    #TRIVY_USERNAME: "$CI_REGISTRY_USER"
+#    #TRIVY_PASSWORD: "$CI_REGISTRY_PASSWORD"
+#    TRIVY_REGISTRY: "$CI_REGISTRY"
+#    TRIVY_CACHE_DIR: ".trivycache/"
 #  script:
-#    - export PYTHON_KEYRING_BACKEND=keyring.backends.null.Keyring
+#    - trivy image --exit-code 1 --severity HIGH --insecure $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
-#    - poetry install
+#  cache:
-#    - poetry run python3 -m unittest
+#    paths:
+#      - ".trivycache/"
 #  except:
 #    - tags
@@ Line 811: / Line 847: @@
 <code>
 Name: test-cgi
-Redirect URI: http://gate.corp13.un/cgi-bin/test-cgi  !!! Если URL каталога, то без финального "/" !!!
+Redirect URI: http://gate.corpX.un/cgi-bin/test-cgi  !!! Если URL каталога, то без финального "/" !!!
 Trusted: Yes
 Confidential: Yes

Методические материалы Лохтурова Вячеслава

User Tools

Site Tools

Differences

Page Tools