Skip to content

Commit 1002584

Browse files
kshitijrajsharmakshitijrajsharma
authored
Merge pull request #410 from hotosm/feature/offline-prediction
HOTfix : Fix docker tags
2 parents 18db20f + 8eab561 commit 1002584

File tree

3 files changed

+48
-25
lines changed

3 files changed

+48
-25
lines changed

‎.github/workflows/docker_build.yml‎

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
name: Build Docker Images
2-
32
on:
43
push:
54
branches:
@@ -17,18 +16,16 @@ on:
1716
paths:
1817
- "backend/**"
1918
- ".github/workflows/docker_build.yml"
20-
2119
env:
2220
REGISTRY: ghcr.io
2321
IMAGE_NAME: ${{ github.repository }}
2422

2523
jobs:
26-
build-api-image:
27-
runs-on: ubuntu-latest
24+
build-and-push-api-image:
25+
runs-on: ubuntu-24.04
2826
permissions:
2927
contents: read
3028
packages: write
31-
actions: write
3229
steps:
3330
- name: Remove unnecessary files
3431
run: |
@@ -48,10 +45,15 @@ jobs:
4845
id: meta_api
4946
uses: docker/metadata-action@v5
5047
with:
51-
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}_api
48+
images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/fair-api
49+
tags: |
50+
type=ref,event=branch
51+
type=ref,event=tag
52+
type=semver,pattern={{version}}
53+
type=semver,pattern={{major}}.{{minor}}
5254
5355
- name: Set up Docker Buildx
54-
uses: docker/setup-buildx-action@v3
56+
uses: docker/setup-buildx-action@v2
5557

5658
- name: Build and push API Docker image
5759
uses: docker/build-push-action@v6
@@ -65,16 +67,15 @@ jobs:
6567
cache-to: type=gha,mode=max,scope=api,timeout=20m,ignore-error=true
6668
github-token: ${{ secrets.GITHUB_TOKEN }}
6769

68-
build-worker-image:
69-
needs: build-api-image
70-
runs-on: ubuntu-latest
70+
build-and-push-worker-image:
71+
needs: build-and-push-api-image
72+
runs-on: ubuntu-24.04
7173
strategy:
7274
matrix:
7375
build_type: [cpu, gpu]
7476
permissions:
7577
contents: read
7678
packages: write
77-
actions: write
7879
steps:
7980
- name: Remove unnecessary files
8081
run: |
@@ -94,13 +95,15 @@ jobs:
9495
id: meta_worker
9596
uses: docker/metadata-action@v5
9697
with:
97-
images: |
98-
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}_worker
98+
images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/fair-worker
9999
tags: |
100-
type=raw,value=latest-${{ matrix.build_type }}
100+
type=ref,event=branch,suffix=-${{ matrix.build_type }}
101+
type=ref,event=tag,suffix=-${{ matrix.build_type }}
102+
type=semver,pattern={{version}},suffix=-${{ matrix.build_type }}
103+
type=semver,pattern={{major}}.{{minor}},suffix=-${{ matrix.build_type }}
101104
102105
- name: Set up Docker Buildx
103-
uses: docker/setup-buildx-action@v3
106+
uses: docker/setup-buildx-action@v2
104107

105108
- name: Build and push Worker Docker image (${{ matrix.build_type }})
106109
uses: docker/build-push-action@v6
@@ -116,13 +119,12 @@ jobs:
116119
cache-to: type=gha,mode=min,scope=docker-worker-${{ matrix.build_type }},timeout=20m,ignore-error=true
117120
github-token: ${{ secrets.GITHUB_TOKEN }}
118121

119-
build-offline-predictor-image:
122+
build-and-push-offline-predictor-image:
120123
runs-on: ubuntu-24.04
121-
needs: build-api-image
124+
needs: build-and-push-api-image
122125
permissions:
123126
contents: read
124127
packages: write
125-
actions: write
126128
steps:
127129
- name: Remove unnecessary files
128130
run: |
@@ -142,7 +144,12 @@ jobs:
142144
id: meta_offline_predictor
143145
uses: docker/metadata-action@v5
144146
with:
145-
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}_offline_predictor
147+
images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/fair-offline-predictor
148+
tags: |
149+
type=ref,event=branch
150+
type=ref,event=tag
151+
type=semver,pattern={{version}}
152+
type=semver,pattern={{major}}.{{minor}}
146153
147154
- name: Set up Docker Buildx
148155
uses: docker/setup-buildx-action@v2

‎.github/workflows/docker_publish_image.yml‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ on:
55
branches:
66
- master
77
- develop
8-
98
paths-ignore:
109
- ".github/workflows/backend_build.yml"
1110
- ".github/workflows/frontend_build.yml"
@@ -42,7 +41,12 @@ jobs:
4241
id: meta_api
4342
uses: docker/metadata-action@v5
4443
with:
45-
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}_api
44+
images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/fair-api
45+
tags: |
46+
type=ref,event=branch
47+
type=ref,event=tag
48+
type=semver,pattern={{version}}
49+
type=semver,pattern={{major}}.{{minor}}
4650
4751
- name: Set up Docker Buildx
4852
uses: docker/setup-buildx-action@v2
@@ -58,6 +62,7 @@ jobs:
5862
cache-from: type=gha,scope=api,timeout=20m
5963
cache-to: type=gha,mode=max,scope=api,timeout=20m,ignore-error=true
6064
github-token: ${{ secrets.GITHUB_TOKEN }}
65+
6166
build-and-push-worker-image:
6267
needs: build-and-push-api-image
6368
runs-on: ubuntu-24.04
@@ -86,10 +91,12 @@ jobs:
8691
id: meta_worker
8792
uses: docker/metadata-action@v5
8893
with:
89-
images: |
90-
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}_worker
94+
images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/fair-worker
9195
tags: |
92-
type=raw,value=latest-${{ matrix.build_type }}
96+
type=ref,event=branch,suffix=-${{ matrix.build_type }}
97+
type=ref,event=tag,suffix=-${{ matrix.build_type }}
98+
type=semver,pattern={{version}},suffix=-${{ matrix.build_type }}
99+
type=semver,pattern={{major}}.{{minor}},suffix=-${{ matrix.build_type }}
93100
94101
- name: Set up Docker Buildx
95102
uses: docker/setup-buildx-action@v2
@@ -133,7 +140,12 @@ jobs:
133140
id: meta_offline_predictor
134141
uses: docker/metadata-action@v5
135142
with:
136-
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}_offline_predictor
143+
images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/fair-offline-predictor
144+
tags: |
145+
type=ref,event=branch
146+
type=ref,event=tag
147+
type=semver,pattern={{version}}
148+
type=semver,pattern={{major}}.{{minor}}
137149
138150
- name: Set up Docker Buildx
139151
uses: docker/setup-buildx-action@v2

‎docker-compose.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ services:
2121
- "6379:6379"
2222

2323
backend-api:
24+
image: ghcr.io/hotosm/fair_api:develop
2425
build:
2526
context: ./backend
2627
dockerfile: Dockerfile.API
@@ -44,6 +45,7 @@ services:
4445

4546
backend-worker-cpu:
4647
profiles: ["cpu"]
48+
image: ghcr.io/hotosm/fair_worker:develop-cpu
4749
build:
4850
context: ./backend
4951
dockerfile: Dockerfile.workers
@@ -68,6 +70,7 @@ services:
6870

6971
backend-worker-gpu:
7072
profiles: ["gpu"]
73+
image: ghcr.io/hotosm/fair_worker:develop-gpu
7174
build:
7275
context: ./backend
7376
dockerfile: Dockerfile.workers
@@ -97,6 +100,7 @@ services:
97100
- postgres
98101

99102
prediction-worker:
103+
image: ghcr.io/hotosm/fair_offline_predictor:develop
100104
build:
101105
context: ./backend
102106
dockerfile: Dockerfile.API

0 commit comments

Comments
 (0)