Skip to content

Commit 2ace5dc

Browse files
committed
ci: refactor docker build calls
1 parent 421e5bb commit 2ace5dc

File tree

3 files changed

+17
-18
lines changed

3 files changed

+17
-18
lines changed

.github/actions/docker-build/action.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
name: Docker build
22
inputs:
33
dockerhub_username:
4+
description: docker hub username
45
type: string
56
dockerhub_token:
7+
description: docker hub token
68
type: string
79

8-
jobs:
10+
runs:
911
using: "composite"
1012
steps:
1113
- name: base image
@@ -19,17 +21,15 @@ jobs:
1921

2022
- name: uploader
2123
uses: geokrety/geokrety-gha-workflows/.github/actions/docker-build@main
22-
needs: docker-base
2324
id: docker-uploader
2425
with:
2526
image_name: geokrety/pictures-processor-base
26-
dockerhub_username: ${{ inputs.dockerhub_username }}
27-
dockerhub_token: ${{ inputs.dockerhub_token }}
27+
dockerhub_username: "${{ inputs.dockerhub_username }}"
28+
dockerhub_token: "${{ inputs.dockerhub_token }}"
2829
dockerfile: Dockerfile.uploader
2930

3031
- name: downloader
3132
uses: geokrety/geokrety-gha-workflows/.github/actions/docker-build@main
32-
needs: docker-base
3333
id: docker-downloader
3434
with:
3535
image_name: geokrety/pictures-processor-base

.github/workflows/docker-build.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- uses: actions/checkout@v3
18-
with:
19-
fetch-depth: 0
20-
2118
- uses: ./.github/actions/docker-build
2219
with:
23-
dockerhub_username: ${{ vars.DOCKERHUB_USERNAME }}
24-
dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }}
20+
dockerhub_username: "${{ vars.DOCKERHUB_USERNAME }}"
21+
dockerhub_token: "${{ secrets.DOCKERHUB_TOKEN }}"

.github/workflows/release.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,18 @@ on:
66
- main
77

88
jobs:
9-
pre-commit:
10-
uses: geokrety/geokrety-gha-workflows/.github/workflows/pre-commit_php.yml@main
9+
# pre-commit:
10+
# uses: geokrety/geokrety-gha-workflows/.github/workflows/pre-commit_php.yml@main
1111

1212
docker:
13-
needs: pre-commit
14-
uses: ./.github/workflows/docker-build.yml
15-
with:
16-
dockerhub_username: ${{ vars.DOCKERHUB_USERNAME }}
17-
secrets:
18-
dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }}
13+
# needs: pre-commit
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v3
17+
- uses: ./.github/actions/docker-build
18+
with:
19+
dockerhub_username: ${{ vars.DOCKERHUB_USERNAME }}
20+
dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }}
1921

2022
build-release:
2123
uses: geokrety/geokrety-gha-workflows/.github/workflows/semantic-release.yml@main

0 commit comments

Comments
 (0)