Skip to content

Commit 1c2900f

Browse files
ismoilovdevmlismoilovdevml
committed
[FIX] fixed bugs
1 parent c638060 commit 1c2900f

File tree

6 files changed

+61
-17
lines changed

6 files changed

+61
-17
lines changed

‎pages/guides/ci-cd/_meta.en-UZ.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,12 @@
5959
"description": "Gitlab CI va Github Actions bilan",
6060
"href": "/guides/ci-cd/java-spring-boot-deployment"
6161
},
62+
"nexus": {
63+
"title": "Nexus o'rnatish va integratsiya",
64+
"icon": "▶️",
65+
"description": "Sonatype Nexus Repository Manager",
66+
"href": "/guides/ci-cd/nexus"
67+
},
6268
"m1-runner-setup": {
6369
"title": "Github Actionsga M1 macOS runner qo'shish",
6470
"icon": "▶️",

‎pages/guides/ci-cd/github-actions-ci-cd.en-UZ.mdx‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ jobs:
314314
docker pull "${{ env.REGISTRY }}/${{ env.REPO_NAME }}:${{ github.sha }}"
315315
docker stop "${{ env.CONTAINER_NAME }}" || true
316316
docker rm "${{ env.CONTAINER_NAME }}" || true
317-
docker run -d --name "${{ env.CONTAINER_NAME }}" -p "${{ env.PORT }}" "${{ env.REGISTRY }}/${{ env.REPO_NAME }}:${{ github.sha }}"
317+
docker run -d --name "${{ env.CONTAINER_NAME }}" --restart=always -p "${{ env.PORT }}" "${{ env.REGISTRY }}/${{ env.REPO_NAME }}:${{ github.sha }}"
318318
```
319319

320320

@@ -406,7 +406,7 @@ script: |
406406
docker pull "${{ env.REGISTRY }}/${{ env.REPO_NAME }}:${{ github.sha }}"
407407
docker stop "${{ env.CONTAINER_NAME }}" || true
408408
docker rm "${{ env.CONTAINER_NAME }}" || true
409-
docker run -d --name "${{ env.CONTAINER_NAME }}" -p "${{ env.PORT }}" "${{ env.REGISTRY }}/${{ env.REPO_NAME }}:${{ github.sha }}"
409+
docker run -d --name "${{ env.CONTAINER_NAME }}" --restart=always -p "${{ env.PORT }}" "${{ env.REGISTRY }}/${{ env.REPO_NAME }}:${{ github.sha }}"
410410
```
411411

412412
Ushbu bosqich endi serverda bajariladi yuqorida [appleboy/ssh-action@master](https://github.com/appleboy/ssh-action) orqali Github Actionimiz serverimizga kirgandi endi serverimizda quyidagi buyruqlarni ishga tushiradi.
@@ -539,8 +539,8 @@ jobs:
539539
docker stop "${{ env.API_CONTAINER_NAME }}" || true
540540
docker rm "${{ env.UI_CONTAINER_NAME }}" || true
541541
docker rm "${{ env.API_CONTAINER_NAME }}" || true
542-
docker run -d --name "${{ env.API_CONTAINER_NAME }}" -p "${{ env.API_PORT }}" "${{ env.REGISTRY }}/${{ env.REPO_NAME}}/${{ env.API_IMAGE_NAME }}:${{ github.sha }}"
543-
docker run -d --name "${{ env.UI_CONTAINER_NAME }}" -p "${{ env.UI_PORT }}" "${{ env.REGISTRY }}/${{ env.REPO_NAME}}/${{ env.UI_IMAGE_NAME }}:${{ github.sha }}"
542+
docker run -d --name "${{ env.API_CONTAINER_NAME }}" --restart=always -p "${{ env.API_PORT }}" "${{ env.REGISTRY }}/${{ env.REPO_NAME}}/${{ env.API_IMAGE_NAME }}:${{ github.sha }}"
543+
docker run -d --name "${{ env.UI_CONTAINER_NAME }}" --restart=always -p "${{ env.UI_PORT }}" "${{ env.REGISTRY }}/${{ env.REPO_NAME}}/${{ env.UI_IMAGE_NAME }}:${{ github.sha }}"
544544
```
545545

546546
Ushbu multi container ham yuqoridagi bitta containerlidek bir xil ishlaydi faqat bir nechta container bilan birga. Ushbu Github Actions ikkita docker image build qilib push qiladi va serverda eski ikkita containerni to'xtatib o'chirib yangi Container Registrydagi ikkita containerni berilgan portda berilgan nom bilan ishga tushirib qo'yadi.
@@ -642,7 +642,7 @@ jobs:
642642
docker pull ${{ env.DOCKERHUB_USERNAME }}/${{ env.CONTAINER_NAME }}:${{ github.sha }}
643643
docker stop ${{ env.CONTAINER_NAME }} || true
644644
docker rm ${{ env.CONTAINER_NAME }} || true
645-
docker run -d --name ${{ env.CONTAINER_NAME }} -p ${{ env.PORT }} ${{ env.DOCKERHUB_USERNAME }}/${{ env.CONTAINER_NAME }}:${{ github.sha }}
645+
docker run -d --name ${{ env.CONTAINER_NAME }} --restart=always -p ${{ env.PORT }} ${{ env.DOCKERHUB_USERNAME }}/${{ env.CONTAINER_NAME }}:${{ github.sha }}
646646
```
647647

648648
#### Multi-container
@@ -718,8 +718,8 @@ jobs:
718718
docker stop ${{ env.UI_CONTAINER_NAME }} || true
719719
docker rm ${{ env.API_CONTAINER_NAME }} || true
720720
docker rm ${{ env.UI_CONTAINER_NAME }} || true
721-
docker run -d --name ${{ env.API_CONTAINER_NAME }} -p ${{ env.API_PORT }} ${{ env.DOCKERHUB_USERNAME }}/${{ env.API_CONTAINER_NAME }}:${{ github.sha }}
722-
docker run -d --name ${{ env.UI_CONTAINER_NAME }} -p ${{ env.UI_PORT }} ${{ env.DOCKERHUB_USERNAME }}/${{ env.UI_CONTAINER_NAME }}:${{ github.sha }}
721+
docker run -d --name ${{ env.API_CONTAINER_NAME }} --restart=always -p ${{ env.API_PORT }} ${{ env.DOCKERHUB_USERNAME }}/${{ env.API_CONTAINER_NAME }}:${{ github.sha }}
722+
docker run -d --name ${{ env.UI_CONTAINER_NAME }} --restart=always -p ${{ env.UI_PORT }} ${{ env.DOCKERHUB_USERNAME }}/${{ env.UI_CONTAINER_NAME }}:${{ github.sha }}
723723
```
724724

725725
### GCR Google Container Registry
@@ -798,7 +798,7 @@ jobs:
798798
docker pull gcr.io/${{ env.GCP_PROJECT_ID }}/${{ env.CONTAINER_NAME }}:latest
799799
docker stop ${{ env.CONTAINER_NAME }} || true
800800
docker rm ${{ env.CONTAINER_NAME }} || true
801-
docker run -d --name ${{ env.CONTAINER_NAME }} -p ${{ env.PORT }} gcr.io/${{ env.GCP_PROJECT_ID }}/${{ env.CONTAINER_NAME }}:latest
801+
docker run -d --name ${{ env.CONTAINER_NAME }} --restart=always -p ${{ env.PORT }} gcr.io/${{ env.GCP_PROJECT_ID }}/${{ env.CONTAINER_NAME }}:latest
802802
rm keyfile.json
803803
```
804804

@@ -881,8 +881,8 @@ jobs:
881881
docker stop ${{ env.UI_CONTAINER_NAME }} || true
882882
docker rm ${{ env.API_CONTAINER_NAME }} || true
883883
docker rm ${{ env.UI_CONTAINER_NAME }} || true
884-
docker run -d --name ${{ env.API_CONTAINER_NAME }} -p ${{ env.API_PORT }} gcr.io/${{ env.GCP_PROJECT_ID }}/${{ env.API_CONTAINER_NAME }}:${{ github.sha }}
885-
docker run -d --name ${{ env.UI_CONTAINER_NAME }} -p ${{ env.UI_PORT }} gcr.io/${{ env.GCP_PROJECT_ID }}/${{ env.UI_CONTAINER_NAME }}:${{ github.sha }}
884+
docker run -d --name ${{ env.API_CONTAINER_NAME }} --restart=always -p ${{ env.API_PORT }} gcr.io/${{ env.GCP_PROJECT_ID }}/${{ env.API_CONTAINER_NAME }}:${{ github.sha }}
885+
docker run -d --name ${{ env.UI_CONTAINER_NAME }} --restart=always -p ${{ env.UI_PORT }} gcr.io/${{ env.GCP_PROJECT_ID }}/${{ env.UI_CONTAINER_NAME }}:${{ github.sha }}
886886
rm keyfile.json
887887
```
888888

‎pages/guides/ci-cd/java-spring-boot-deployment.en-UZ.mdx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ deploy:
427427
- ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no $SSH_USER@$SSH_HOST "docker pull $REGISTRY/$REPO_NAME/$IMAGE_NAME:$CI_COMMIT_SHA"
428428
- ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no $SSH_USER@$SSH_HOST "docker stop $CONTAINER_NAME || true"
429429
- ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no $SSH_USER@$SSH_HOST "docker rm $CONTAINER_NAME || true"
430-
- ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no "$SSH_USER@$SSH_HOST" "docker run -d --name $CONTAINER_NAME -p $PORT -e SPRING_PROFILES_ACTIVE=$SPRING_PROFILES_ACTIVE -e DEV_DATABASE_URL=$DEV_DATABASE_URL -e DEV_DATABASE_USERNAME=$DEV_DATABASE_USERNAME -e DEV_DATABASE_PASSWORD=$DEV_DATABASE_PASSWORD $REGISTRY/$REPO_NAME/$IMAGE_NAME:$CI_COMMIT_SHA"
430+
- ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no "$SSH_USER@$SSH_HOST" "docker run -d --name $CONTAINER_NAME --restart=always -p $PORT -e SPRING_PROFILES_ACTIVE=$SPRING_PROFILES_ACTIVE -e DEV_DATABASE_URL=$DEV_DATABASE_URL -e DEV_DATABASE_USERNAME=$DEV_DATABASE_USERNAME -e DEV_DATABASE_PASSWORD=$DEV_DATABASE_PASSWORD $REGISTRY/$REPO_NAME/$IMAGE_NAME:$CI_COMMIT_SHA"
431431
```
432432

433433
Ushbu CD pipeline'ni tushunish uchun quyidagi qadamlarni ko'rib chiqamiz:
@@ -654,7 +654,7 @@ jobs:
654654
docker pull "${{ env.REGISTRY }}/${{ env.REPO_NAME }}:${{ github.sha }}"
655655
docker stop "${{ env.CONTAINER_NAME }}" || true
656656
docker rm "${{ env.CONTAINER_NAME }}" || true
657-
docker run -d --name ${{ env.CONTAINER_NAME }} -p ${{ env.PORT }} \
657+
docker run -d --name ${{ env.CONTAINER_NAME }} --restart=always -p ${{ env.PORT }} \
658658
-e SPRING_PROFILES_ACTIVE=${{ env.SPRING_PROFILES_ACTIVE }} \
659659
-e DEV_DATABASE_URL=${{ secrets.DEV_DATABASE_URL }} \
660660
-e DEV_DATABASE_USERNAME=${{ secrets.DEV_DATABASE_USERNAME }} \

‎pages/guides/ci-cd/jenkins-docker-ci-cd.en-UZ.mdx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ stage('Deploy Server') {
829829
docker pull ${REGISTRY_URL}/${CONTAINER_NAME}:latest && \
830830
docker stop ${CONTAINER_NAME} || true && \
831831
docker rm ${CONTAINER_NAME} || true && \
832-
docker run -d -p 3000:3000 --name ${CONTAINER_NAME} --restart always ${REGISTRY_URL}/${CONTAINER_NAME}:latest '
832+
docker run -d -p 3000:3000 --name ${CONTAINER_NAME} --restart=always --restart always ${REGISTRY_URL}/${CONTAINER_NAME}:latest '
833833
"""
834834
}
835835
}
@@ -895,7 +895,7 @@ stage('Deploy to Server') {
895895
docker pull ${REGISTRY_URL}/${GCP_PROJECT_ID}/${CONTAINER_NAME}:latest && \
896896
docker stop ${CONTAINER_NAME} || true && \
897897
docker rm ${CONTAINER_NAME} || true && \
898-
docker run -d -p 3000:3000 --name ${CONTAINER_NAME} --restart always ${REGISTRY_URL}/${GCP_PROJECT_ID}/${CONTAINER_NAME}:latest '
898+
docker run -d -p 3000:3000 --name ${CONTAINER_NAME} --restart=always ${REGISTRY_URL}/${GCP_PROJECT_ID}/${CONTAINER_NAME}:latest '
899899
"""
900900
}
901901
}
@@ -964,7 +964,7 @@ pipeline {
964964
docker pull ${REGISTRY_URL}/${CONTAINER_NAME}:latest && \
965965
docker stop ${CONTAINER_NAME} || true && \
966966
docker rm ${CONTAINER_NAME} || true && \
967-
docker run -d -p 3000:3000 --name ${CONTAINER_NAME} --restart always ${REGISTRY_URL}/${CONTAINER_NAME}:latest '
967+
docker run -d -p 3000:3000 --name ${CONTAINER_NAME} --restart=always ${REGISTRY_URL}/${CONTAINER_NAME}:latest '
968968
"""
969969
}
970970
}
@@ -1053,7 +1053,7 @@ pipeline {
10531053
docker pull ${REGISTRY_URL}/${GCP_PROJECT_ID}/${CONTAINER_NAME}:latest && \
10541054
docker stop ${CONTAINER_NAME} || true && \
10551055
docker rm ${CONTAINER_NAME} || true && \
1056-
docker run -d -p 3000:3000 --name ${CONTAINER_NAME} --restart always ${REGISTRY_URL}/${GCP_PROJECT_ID}/${CONTAINER_NAME}:latest '
1056+
docker run -d -p 3000:3000 --name ${CONTAINER_NAME} --restart=always ${REGISTRY_URL}/${GCP_PROJECT_ID}/${CONTAINER_NAME}:latest '
10571057
"""
10581058
}
10591059
}

‎pages/guides/ci-cd/nexus.en-UZ.mdx‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
---
2+
image: https://raw.githubusercontent.com/devops-journey-uz/assets/main/images/tutorials/ci-cd/nexus/banner.png
3+
description: "Java Spring Boot Deployment: Gitlab CI va Github Actions"
4+
---
5+
6+
import { Callout } from "nextra-theme-docs";
7+
8+
# Sonatype Nexus Repository Manager
9+
10+
![nexus](https://raw.githubusercontent.com/devops-journey-uz/assets/main/images/tutorials/ci-cd/nexus/banner.png)
11+
12+
Bugungi software development jarayonlarida CI/CD (Continuous Integration/Continuous Deployment) jarayonlarini samarali yuritish muhim ahamiyat kasb etadi. Bunday jarayonlarda paketlar va artifaktlarni boshqarish uchun maxsus repository managerlar kerak bo'ladi. **Sonatype Nexus Repository Manager** - eng ommabop va ishonchli artifakt menejerlardan biri bo'lib, Java (Maven, Gradle), .NET (NuGet), Python (PyPi), Docker va boshqa paketlarni saqlash va boshqarish uchun eng mashhur va ishonchli yechimlardan biridir.
13+
14+
Nexus opensource **(Nexus OSS)** va pullik **(Nexus Pro)** versiyalarda mavjud bo'lib, ushbu qo'llanma asosan **Nexus OSS** bilan ishlashga yo'naltirilgan.
15+
16+
**Sonatype Nexus Repository Manager** dasturi dastlab 2007-yilda **Sonatype Inc**. tomonidan ishlab chiqilgan. U dasturiy ta'minot artifaktlarini saqlash, boshqarish va tarqatish uchun mo'ljallangan markazlashtirilgan repository menejeri sifatida ishlab chiqilgan.
17+
18+
Nexus Repository Manager dasturiy ta'minot ishlab chiqishda artifaktlar va paketlarni saqlash, boshqarish hamda ularga kirishni ta'minlash uchun ishlatiladi. Java (Maven, Gradle), .NET (NuGet), Node.js (NPM), Docker, Python (PyPi) kabi texnologiyalar uchun artifaktlarni markazlashtirilgan holda saqlaydi va boshqaradi.Tashqi repository'lardan yuklash jarayonlarini tezlashtirish va tarmoq yuklamasini kamaytirish imkonini beradi va Korxona ichki(local) repository'sini yaratishi, Kompaniyaning o'ziga xos kutubxonalarini(library) boshqarish, xavfsizlikni ta'minlash va dasturiy ta'minot jarayonlarini optimallashtirish uchun ishlatiladi.
19+
20+
21+
Bu amaliyotda biz **Sonatype Nexus Repository Manager**ni docker yordamida o'rnatish va sozlashni va loyihalarimizga va CI/CD ga integratsiya qilishni ko'rib chiqamiz.
22+
23+
24+
## Nexus o'rnatish
25+
26+
Bu amaliyotda biz **Nexus**ni docker yordamida ishga tushiramiz va o'rnatishning manual va ansible yordamida qilishni ko'rib chiqamiz.
27+
Quyidagi qo'llanmadan foydalanib Docker o'rnatib olishingiz mumkin - [**Docker o'rnatish**](https://devops-journey.uz/guides/konteyner/docker-ornatish)
28+
29+
### Manual o'rnatish
30+
31+
```bash
32+
sudo mkdir -p /mnt/nexus/nexus-data
33+
sudo chown -R 200 /mnt/nexus/nexus-data
34+
```
35+
36+
```bash
37+
docker run -d -p 8081:8081 --name nexus --restart=always -v /mnt/nexus/nexus-data:/nexus-data sonatype/nexus3
38+
```

‎pages/guides/konteyner/docker-ornatish.en-UZ.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ Docker user group mavjud, lekin userlarni o'z ichiga olmaydi, shuning uchun siz
281281
**2->** Docker Engine muvaffaqiyatli o'rnatilganini tekshirish uchun `devops-journey-uz` docker imageni ishga tushirib tekshirib ko'ramiz.
282282

283283
```bash
284-
sudo docker run -d -p 3000:3000 --name devops-journey --restart always devopsjourneyuz/devops-journey-uz:latest
284+
sudo docker run -d -p 3000:3000 --name devops-journey --restart=always devopsjourneyuz/devops-journey-uz:latest
285285
```
286286
Bu buyruq `devopsjourneyuz:latest` imageni yuklaydi va uni containerda ishga tushiradi. Container ishga tushganda, u tasdiqlash xabarini chop etadi va chiqadi. Agar serveringizda `3000` portda DevOps Journey platformasi ishlab turgan bo'lsa, tabriklaymiz siz Docker Engine-ni muvaffaqiyatli o'rnatdingiz va ishga tushirdingiz.
287287

0 commit comments

Comments
 (0)