From cc63d22fac2dc501039442417850c51c18544903 Mon Sep 17 00:00:00 2001
From: kromskii2 <146603192+kromskii2@users.noreply.github.com>
Date: Tue, 31 Dec 2024 11:11:40 +0300
Subject: [PATCH] Update docker-image.yml

---
 .github/workflows/docker-image.yml | 37 ++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 3f53646..93b3802 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -1,18 +1,37 @@
-name: Docker Image CI
+name: Create Docker Image
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "main" ]    # Запускать при пуше в main
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main" ]    # Запускать при pull-request'ах в main
 
 jobs:
-
-  build:
-
+  build-and-push:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
-    - name: Build the Docker image
-      run: docker build . --file Dockerfile --tag my-image-name:$(date +%s)
+      # Шаг 1: Клонируем репозиторий
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      # Шаг 2: Логинимся в Docker Hub
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          registry: docker.io
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      # Шаг 3: Сборка и пуш Docker-образа
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: Dockerfile              # Если Dockerfile в другом месте, поменяйте путь
+          push: true                   # Говорим, что нужно пушить образ
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/my-image-name:latest
+          # Можно указать несколько тэгов (например, с Git SHA или датой):
+          # tags: |
+          #   ${{ secrets.DOCKERHUB_USERNAME }}/my-image-name:latest
+          #   ${{ secrets.DOCKERHUB_USERNAME }}/my-image-name:${{ github.sha }}