Skip to content

Commit 2a60482

Browse files
YevhenZvierievYevhenZvieriev
authored
Merge branch 'master' into feature/container-monitor
2 parents be32d82 + a56c3ea commit 2a60482

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1119
-279
lines changed

‎.github/dependabot.yml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: github-actions
4+
directory: /
5+
schedule:
6+
interval: daily

‎.github/workflows/build-elasticsearch-7.17.yml ‎.github/workflows/build-elasticsearch-7-17.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: build-elasticsearch-7.17
1+
name: build-elasticsearch-7-17
22

33
on: workflow_dispatch
44

@@ -8,27 +8,27 @@ jobs:
88
steps:
99
-
1010
name: Checkout
11-
uses: actions/checkout@v2
11+
uses: actions/checkout@v4
1212
-
1313
name: Set up QEMU
14-
uses: docker/setup-qemu-action@v1
14+
uses: docker/setup-qemu-action@v3
1515
-
1616
name: Set up Docker Buildx
17-
uses: docker/setup-buildx-action@v1
17+
uses: docker/setup-buildx-action@v3
1818
-
1919
name: Login to DockerHub
20-
uses: docker/login-action@v1
20+
uses: docker/login-action@v3
2121
with:
2222
username: ${{ secrets.DOCKERHUB_USERNAME }}
2323
password: ${{ secrets.DOCKERHUB_TOKEN }}
2424
-
2525
name: Build and push
2626
id: docker_build
27-
uses: docker/build-push-action@v2
27+
uses: docker/build-push-action@v5
2828
with:
2929
context: images/elasticsearch/7.17
3030
platforms: linux/amd64,linux/arm64
3131
push: true
3232
tags: |
3333
markoshust/magento-elasticsearch:7.17
34-
markoshust/magento-elasticsearch:7.17-0
34+
markoshust/magento-elasticsearch:7.17-1

‎.github/workflows/build-elasticsearch-8.4.yml ‎.github/workflows/build-elasticsearch-8-4.yml

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: build-elasticsearch-8.4
1+
name: build-elasticsearch-8-4
22

33
on: workflow_dispatch
44

@@ -8,26 +8,27 @@ jobs:
88
steps:
99
-
1010
name: Checkout
11-
uses: actions/checkout@v2
11+
uses: actions/checkout@v4
1212
-
1313
name: Set up QEMU
14-
uses: docker/setup-qemu-action@v1
14+
uses: docker/setup-qemu-action@v3
1515
-
1616
name: Set up Docker Buildx
17-
uses: docker/setup-buildx-action@v1
17+
uses: docker/setup-buildx-action@v3
1818
-
1919
name: Login to DockerHub
20-
uses: docker/login-action@v1
20+
uses: docker/login-action@v3
2121
with:
2222
username: ${{ secrets.DOCKERHUB_USERNAME }}
2323
password: ${{ secrets.DOCKERHUB_TOKEN }}
2424
-
2525
name: Build and push
2626
id: docker_build
27-
uses: docker/build-push-action@v2
27+
uses: docker/build-push-action@v5
2828
with:
2929
context: images/elasticsearch/8.4
3030
platforms: linux/amd64,linux/arm64
3131
push: true
3232
tags: |
33-
markoshust/magento-elasticsearch:8.4-develop
33+
markoshust/magento-elasticsearch:8.4
34+
markoshust/magento-elasticsearch:8.4-0

‎.github/workflows/build-elasticsearch-8-5.yml

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: build-elasticsearch-8-5
2+
3+
on: workflow_dispatch
4+
5+
jobs:
6+
elasticsearch-8-5:
7+
runs-on: ubuntu-latest
8+
steps:
9+
-
10+
name: Checkout
11+
uses: actions/checkout@v4
12+
-
13+
name: Set up QEMU
14+
uses: docker/setup-qemu-action@v3
15+
-
16+
name: Set up Docker Buildx
17+
uses: docker/setup-buildx-action@v3
18+
-
19+
name: Login to DockerHub
20+
uses: docker/login-action@v3
21+
with:
22+
username: ${{ secrets.DOCKERHUB_USERNAME }}
23+
password: ${{ secrets.DOCKERHUB_TOKEN }}
24+
-
25+
name: Build and push
26+
id: docker_build
27+
uses: docker/build-push-action@v5
28+
with:
29+
context: images/elasticsearch/8.5
30+
platforms: linux/amd64,linux/arm64
31+
push: true
32+
tags: |
33+
markoshust/magento-elasticsearch:8.5
34+
markoshust/magento-elasticsearch:8.5-0

‎.github/workflows/build-elasticsearch.yml

-62
This file was deleted.

‎.github/workflows/build-nginx.yml ‎.github/workflows/build-nginx-1-18.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: build-nginx
1+
name: build-nginx-1-18
22

33
on: workflow_dispatch
44

@@ -8,23 +8,23 @@ jobs:
88
steps:
99
-
1010
name: Checkout
11-
uses: actions/checkout@v2
11+
uses: actions/checkout@v4
1212
-
1313
name: Set up QEMU
14-
uses: docker/setup-qemu-action@v1
14+
uses: docker/setup-qemu-action@v3
1515
-
1616
name: Set up Docker Buildx
17-
uses: docker/setup-buildx-action@v1
17+
uses: docker/setup-buildx-action@v3
1818
-
1919
name: Login to DockerHub
20-
uses: docker/login-action@v1
20+
uses: docker/login-action@v3
2121
with:
2222
username: ${{ secrets.DOCKERHUB_USERNAME }}
2323
password: ${{ secrets.DOCKERHUB_TOKEN }}
2424
-
2525
name: Build and push
2626
id: docker_build
27-
uses: docker/build-push-action@v2
27+
uses: docker/build-push-action@v5
2828
with:
2929
context: images/nginx/1.18
3030
platforms: linux/amd64,linux/arm64

‎.github/workflows/build-opensearch-1-2.yml

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: build-opensearch-1-2
2+
3+
on: workflow_dispatch
4+
5+
jobs:
6+
opensearch-1-2:
7+
runs-on: ubuntu-latest
8+
steps:
9+
-
10+
name: Checkout
11+
uses: actions/checkout@v4
12+
-
13+
name: Set up QEMU
14+
uses: docker/setup-qemu-action@v3
15+
-
16+
name: Set up Docker Buildx
17+
uses: docker/setup-buildx-action@v3
18+
-
19+
name: Login to DockerHub
20+
uses: docker/login-action@v3
21+
with:
22+
username: ${{ secrets.DOCKERHUB_USERNAME }}
23+
password: ${{ secrets.DOCKERHUB_TOKEN }}
24+
-
25+
name: Build and push
26+
id: docker_build
27+
uses: docker/build-push-action@v5
28+
with:
29+
context: images/opensearch/1.2
30+
platforms: linux/amd64,linux/arm64
31+
push: true
32+
tags: |
33+
markoshust/magento-opensearch:1.2
34+
markoshust/magento-opensearch:1.2-0

‎.github/workflows/build-opensearch.yml ‎.github/workflows/build-opensearch-2-5.yml

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: build-opensearch
1+
name: build-opensearch-2-5
22

33
on: workflow_dispatch
44

@@ -8,26 +8,27 @@ jobs:
88
steps:
99
-
1010
name: Checkout
11-
uses: actions/checkout@v2
11+
uses: actions/checkout@v4
1212
-
1313
name: Set up QEMU
14-
uses: docker/setup-qemu-action@v1
14+
uses: docker/setup-qemu-action@v3
1515
-
1616
name: Set up Docker Buildx
17-
uses: docker/setup-buildx-action@v1
17+
uses: docker/setup-buildx-action@v3
1818
-
1919
name: Login to DockerHub
20-
uses: docker/login-action@v1
20+
uses: docker/login-action@v3
2121
with:
2222
username: ${{ secrets.DOCKERHUB_USERNAME }}
2323
password: ${{ secrets.DOCKERHUB_TOKEN }}
2424
-
2525
name: Build and push
2626
id: docker_build
27-
uses: docker/build-push-action@v2
27+
uses: docker/build-push-action@v5
2828
with:
29-
context: images/opensearch/2.4
29+
context: images/opensearch/2.5
3030
platforms: linux/amd64,linux/arm64
3131
push: true
3232
tags: |
33-
markoshust/magento-opensearch:2.5-0
33+
markoshust/magento-opensearch:2.5
34+
markoshust/magento-opensearch:2.5-1

‎.github/workflows/build-php-8.1.yml ‎.github/workflows/build-php-8-1.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: build-php-8.1
1+
name: build-php-8-1
22

33
on: workflow_dispatch
44

@@ -8,27 +8,27 @@ jobs:
88
steps:
99
-
1010
name: Checkout
11-
uses: actions/checkout@v2
11+
uses: actions/checkout@v4
1212
-
1313
name: Set up QEMU
14-
uses: docker/setup-qemu-action@v1
14+
uses: docker/setup-qemu-action@v3
1515
-
1616
name: Set up Docker Buildx
17-
uses: docker/setup-buildx-action@v1
17+
uses: docker/setup-buildx-action@v3
1818
-
1919
name: Login to DockerHub
20-
uses: docker/login-action@v1
20+
uses: docker/login-action@v3
2121
with:
2222
username: ${{ secrets.DOCKERHUB_USERNAME }}
2323
password: ${{ secrets.DOCKERHUB_TOKEN }}
2424
-
2525
name: Build and push
2626
id: docker_build
27-
uses: docker/build-push-action@v2
27+
uses: docker/build-push-action@v5
2828
with:
2929
context: images/php/8.1
3030
platforms: linux/amd64,linux/arm64
3131
push: true
3232
tags: |
3333
markoshust/magento-php:8.1-fpm
34-
markoshust/magento-php:8.1-fpm-1
34+
markoshust/magento-php:8.1-fpm-2

‎.github/workflows/build-php-8.2.yml ‎.github/workflows/build-php-8-2.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: build-php-8.2
1+
name: build-php-8-2
22

33
on: workflow_dispatch
44

@@ -8,27 +8,27 @@ jobs:
88
steps:
99
-
1010
name: Checkout
11-
uses: actions/checkout@v2
11+
uses: actions/checkout@v4
1212
-
1313
name: Set up QEMU
14-
uses: docker/setup-qemu-action@v1
14+
uses: docker/setup-qemu-action@v3
1515
-
1616
name: Set up Docker Buildx
17-
uses: docker/setup-buildx-action@v1
17+
uses: docker/setup-buildx-action@v3
1818
-
1919
name: Login to DockerHub
20-
uses: docker/login-action@v1
20+
uses: docker/login-action@v3
2121
with:
2222
username: ${{ secrets.DOCKERHUB_USERNAME }}
2323
password: ${{ secrets.DOCKERHUB_TOKEN }}
2424
-
2525
name: Build and push
2626
id: docker_build
27-
uses: docker/build-push-action@v2
27+
uses: docker/build-push-action@v5
2828
with:
2929
context: images/php/8.2
3030
platforms: linux/amd64,linux/arm64
3131
push: true
3232
tags: |
3333
markoshust/magento-php:8.2-fpm
34-
markoshust/magento-php:8.2-fpm-0
34+
markoshust/magento-php:8.2-fpm-1

0 commit comments

Comments
 (0)