From 33bfe8793f42b0be5328159839e486b15365da5e Mon Sep 17 00:00:00 2001
From: Aleksandr Litvinov <ssssank@gmail.com>
Date: Thu, 17 Mar 2022 08:56:49 +0300
Subject: [PATCH 1/2] [#284] Fix docker-compose. Use override

---
 .github/workflows/Docker.yml | 38 ++++--------------------------------
 Makefile                     | 13 ++++++++++++
 README.md                    | 15 ++++++++------
 docker-compose.override.yml  |  8 ++++++++
 docker-compose.test.yml      |  9 ---------
 docker-compose.yml           |  3 +--
 6 files changed, 35 insertions(+), 51 deletions(-)
 create mode 100644 docker-compose.override.yml
 delete mode 100644 docker-compose.test.yml

diff --git a/.github/workflows/Docker.yml b/.github/workflows/Docker.yml
index 8d26c51a..1516aa63 100644
--- a/.github/workflows/Docker.yml
+++ b/.github/workflows/Docker.yml
@@ -8,42 +8,12 @@ on:
     branches:
       - main
 
-env:
-  # TODO: Change variable to your registry.
-  REGISTRY_NAME: hexletbasics
-
 jobs:
-  build-test:
+  main:
     runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Run tests
-        run: |
-          docker-compose --file docker-compose.test.yml build
-          docker-compose --file docker-compose.test.yml run sut
 
-  build-push-notify:
-    runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'push' }}
-    needs: build-test
     steps:
-      - uses: actions/checkout@v2
-      - name: Set repository name
-        run: |
-          echo "REPOSITORY_NAME=$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $2}')" >> $GITHUB_ENV
-      - name: Build and push into docker hub
-        uses: docker/build-push-action@v1.1.0
+      - uses: hexlet-basics/exercises-action@release
         with:
-          repository: ${{ env.REGISTRY_NAME }}/${{ env.REPOSITORY_NAME }}
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          tags: latest
-      - name: Set fail Slack env vars
-        if: ${{ failure() }}
-        run: |
-          echo "SLACK_COLOR=#a30200" >> $GITHUB_ENV
-      - name: Send notification into Slack
-        if: ${{ always() }}
-        uses: rtCamp/action-slack-notify@v2.0.0
-        env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 98d12686..e561c8a4 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,9 @@ compose-build:
 compose-install:
 	docker-compose run exercises composer install
 
+compose-code-lint:
+	docker-compose run exercises make code-lint
+
 code-lint:
 	composer exec --verbose phpcs -- modules
 
@@ -22,3 +25,13 @@ compose-bash:
 
 compose-test:
 	docker-compose run exercises make test
+
+compose-description-lint:
+	docker-compose run exercises make description-lint
+
+compose-schema-validate:
+	docker-compose run exercises make schema-validate
+
+ci-check:
+	docker-compose --file docker-compose.yml build
+	docker-compose --file docker-compose.yml up --abort-on-container-exit
\ No newline at end of file
diff --git a/README.md b/README.md
index d287f71c..547f1902 100644
--- a/README.md
+++ b/README.md
@@ -10,17 +10,20 @@
 
 ```sh
 # setup
-$ make
+make
 # run
-$ make compose
+make compose
 
 # run tests
-$ make compose-test
+make compose-test
 
 # run linters and validators
-$ make compose-code-lint
-$ make compose-description-lint
-$ make compose-schema-validate
+make compose-code-lint
+make compose-description-lint
+make compose-schema-validate
+
+
+make ci-check # run CI checks witn docker-compose
 ```
 
 В тестах используется [phpower](https://github.com/ngyuki/phpower). Внимательнее при работе с ассертами.
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
new file mode 100644
index 00000000..3d95d250
--- /dev/null
+++ b/docker-compose.override.yml
@@ -0,0 +1,8 @@
+---
+
+version: '3'
+
+services:
+  exercises:
+    volumes:
+      - .:/exercises-php
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
deleted file mode 100644
index 96f8acba..00000000
--- a/docker-compose.test.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-version: '2'
-
-services:
-  sut:
-    build: .
-    image: exercises-php_exercises:latest
-    command: make check
diff --git a/docker-compose.yml b/docker-compose.yml
index ff2936d0..090333cb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,6 +5,5 @@ version: '3'
 services:
   exercises:
     build: .
-    volumes:
-      - .:/exercises-php
+    image: hexletbasics/exercises-php:cached
     command: make check

From c2cdb70b9c186c277fb26fa04ac2dd15c9c06f64 Mon Sep 17 00:00:00 2001
From: Aleksandr Litvinov <ssssank@gmail.com>
Date: Thu, 17 Mar 2022 09:58:47 +0300
Subject: [PATCH 2/2] Add empty strings

---
 .github/workflows/Docker.yml | 2 +-
 Makefile                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/Docker.yml b/.github/workflows/Docker.yml
index 1516aa63..4dded144 100644
--- a/.github/workflows/Docker.yml
+++ b/.github/workflows/Docker.yml
@@ -16,4 +16,4 @@ jobs:
       - uses: hexlet-basics/exercises-action@release
         with:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
\ No newline at end of file
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
diff --git a/Makefile b/Makefile
index e561c8a4..85607c5a 100644
--- a/Makefile
+++ b/Makefile
@@ -34,4 +34,4 @@ compose-schema-validate:
 
 ci-check:
 	docker-compose --file docker-compose.yml build
-	docker-compose --file docker-compose.yml up --abort-on-container-exit
\ No newline at end of file
+	docker-compose --file docker-compose.yml up --abort-on-container-exit