Skip to content

Commit 6e1d8d9

Browse files
Fixed CI
1 parent b894814 commit 6e1d8d9

1 file changed

Lines changed: 12 additions & 9 deletions

File tree

‎.github/workflows/docker.yml‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,59 +41,62 @@ jobs:
4141
run: |
4242
docker build \
4343
-t sketchdb-base:latest \
44-
-t ghcr.io/projectasap/asap-base:${{ github.ref_name }} \
45-
-t ghcr.io/projectasap/asap-base:latest \
4644
-f asap-common/installation/Dockerfile \
4745
asap-common
4846
4947
- name: Push base image
5048
if: startsWith(github.ref, 'refs/tags/')
5149
run: |
50+
docker tag sketchdb-base:latest ghcr.io/projectasap/asap-base:${{ github.ref_name }}
51+
docker tag sketchdb-base:latest ghcr.io/projectasap/asap-base:latest
5252
docker push ghcr.io/projectasap/asap-base:${{ github.ref_name }}
5353
docker push ghcr.io/projectasap/asap-base:latest
5454
5555
# --- Planner (Python, depends on base) ---
5656
- name: Build planner image
5757
run: |
5858
docker build \
59-
-t ghcr.io/projectasap/asap-planner:${{ github.ref_name }} \
60-
-t ghcr.io/projectasap/asap-planner:latest \
59+
-t asap-planner:local \
6160
-f asap-planner/Dockerfile \
6261
asap-planner
6362
6463
- name: Push planner image
6564
if: startsWith(github.ref, 'refs/tags/')
6665
run: |
66+
docker tag asap-planner:local ghcr.io/projectasap/asap-planner:${{ github.ref_name }}
67+
docker tag asap-planner:local ghcr.io/projectasap/asap-planner:latest
6768
docker push ghcr.io/projectasap/asap-planner:${{ github.ref_name }}
6869
docker push ghcr.io/projectasap/asap-planner:latest
6970
7071
# --- Sketch Ingest (Python, depends on base) ---
7172
- name: Build sketch-ingest image
7273
run: |
7374
docker build \
74-
-t ghcr.io/projectasap/asap-sketch-ingest:${{ github.ref_name }} \
75-
-t ghcr.io/projectasap/asap-sketch-ingest:latest \
75+
-t asap-sketch-ingest:local \
7676
-f asap-sketch-ingest/Dockerfile \
7777
asap-sketch-ingest
7878
7979
- name: Push sketch-ingest image
8080
if: startsWith(github.ref, 'refs/tags/')
8181
run: |
82+
docker tag asap-sketch-ingest:local ghcr.io/projectasap/asap-sketch-ingest:${{ github.ref_name }}
83+
docker tag asap-sketch-ingest:local ghcr.io/projectasap/asap-sketch-ingest:latest
8284
docker push ghcr.io/projectasap/asap-sketch-ingest:${{ github.ref_name }}
8385
docker push ghcr.io/projectasap/asap-sketch-ingest:latest
8486
8587
# --- Prometheus Client (Python, depends on base) ---
8688
- name: Build prometheus-client image
8789
run: |
8890
docker build \
89-
-t ghcr.io/projectasap/asap-prometheus-client:${{ github.ref_name }} \
90-
-t ghcr.io/projectasap/asap-prometheus-client:latest \
91+
-t asap-prometheus-client:local \
9192
-f asap-tools/queriers/prometheus-client/Dockerfile \
9293
asap-tools/queriers/prometheus-client
9394
9495
- name: Push prometheus-client image
9596
if: startsWith(github.ref, 'refs/tags/')
9697
run: |
98+
docker tag asap-prometheus-client:local ghcr.io/projectasap/asap-prometheus-client:${{ github.ref_name }}
99+
docker tag asap-prometheus-client:local ghcr.io/projectasap/asap-prometheus-client:latest
97100
docker push ghcr.io/projectasap/asap-prometheus-client:${{ github.ref_name }}
98101
docker push ghcr.io/projectasap/asap-prometheus-client:latest
99102
@@ -105,7 +108,7 @@ jobs:
105108
file: asap-query-engine/Dockerfile
106109
push: ${{ startsWith(github.ref, 'refs/tags/') }}
107110
tags: |
108-
ghcr.io/projectasap/asap-query-engine:${{ github.ref_name }}
111+
ghcr.io/projectasap/asap-query-engine:${{ startsWith(github.ref, 'refs/tags/') && github.ref_name || 'pr-test' }}
109112
ghcr.io/projectasap/asap-query-engine:latest
110113
cache-from: type=registry,ref=ghcr.io/projectasap/asap-query-engine:buildcache
111114
cache-to: type=registry,ref=ghcr.io/projectasap/asap-query-engine:buildcache,mode=max

0 commit comments

Comments
 (0)