Skip to content

Commit 41d3a43

Browse files
lalithsureshlalithsuresh
committed
ci: change container name to pipeline-manager
Signed-off-by: Lalith Suresh <lalith@feldera.com>
1 parent b5448da commit 41d3a43

4 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎.github/workflows/containers.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
on:
22
schedule:
3-
- cron: '0 0 * * *'
3+
- cron: '0 0,6,12,18 * * *'
44
release:
55
types: [published]
66

77
env:
88
REGISTRY: ghcr.io
9-
DBSP_IMAGE: ghcr.io/${{ github.repository_owner }}/dbsp-manager
9+
DBSP_IMAGE: ghcr.io/${{ github.repository_owner }}/pipeline-manager
1010
DEMO_IMAGE: ghcr.io/${{ github.repository_owner }}/demo-container
1111

1212
jobs:
@@ -27,8 +27,8 @@ jobs:
2727
env:
2828
muix_license: ${{ secrets.muix_license }}
2929

30-
- name: Docker meta (dbsp-manager)
31-
id: meta_dbsp
30+
- name: Docker meta (pipeline-manager)
31+
id: meta_pipeline_manager
3232
uses: docker/metadata-action@v4
3333
with:
3434
images: ${{ env.DBSP_IMAGE }}
@@ -74,15 +74,15 @@ jobs:
7474
run: docker push ${{ env.DBSP_IMAGE }} && docker push ${{ env.DEMO_IMAGE }}
7575

7676
# Tagged DBSP image
77-
- name: Push (dbsp-manager)
77+
- name: Push (pipeline-manager)
7878
uses: docker/build-push-action@v4
7979
if: github.event_name == 'release'
8080
with:
8181
context: .
8282
file: deploy/Dockerfile
8383
push: true
84-
tags: ${{ steps.meta_dbsp.outputs.tags }}
85-
labels: ${{ steps.meta_dbsp.outputs.labels }}
84+
tags: ${{ steps.meta_pipeline_manager.outputs.tags }}
85+
labels: ${{ steps.meta_pipeline_manager.outputs.labels }}
8686

8787
# Tagged demo image
8888
- name: Push (demo-container)
@@ -98,7 +98,7 @@ jobs:
9898

9999
- uses: actions/delete-package-versions@v4
100100
with:
101-
package-name: dbsp-manager
101+
package-name: pipeline-manager
102102
package-type: 'container'
103103
min-versions-to-keep: 5
104104
delete-only-untagged-versions: 'true'
@@ -108,4 +108,4 @@ jobs:
108108
package-name: demo-container
109109
package-type: 'container'
110110
min-versions-to-keep: 5
111-
delete-only-untagged-versions: 'true'
111+
delete-only-untagged-versions: 'true'

‎Earthfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ test-rust:
501501

502502
# TODO: the following two container tasks duplicate work that we otherwise do in the Dockerfile,
503503
# but by mostly repeating ourselves, we can reuse earlier Earthly stages to speed up the CI.
504-
build-dbsp-manager-container:
504+
build-pipeline-manager-container:
505505
FROM +install-rust
506506
WORKDIR /
507507

@@ -522,7 +522,7 @@ build-dbsp-manager-container:
522522
COPY sql-to-dbsp-compiler/temp /database-stream-processor/sql-to-dbsp-compiler/temp
523523
RUN ./pipeline-manager --bind-address=0.0.0.0 --api-server-working-directory=/working-dir --compiler-working-directory=/working-dir --runner-working-directory=/working-dir --sql-compiler-home=/database-stream-processor/sql-to-dbsp-compiler --dbsp-override-path=/database-stream-processor --precompile
524524
ENTRYPOINT ["./pipeline-manager", "--bind-address=0.0.0.0", "--api-server-working-directory=/working-dir", "--compiler-working-directory=/working-dir", "--runner-working-directory=/working-dir", "--sql-compiler-home=/database-stream-processor/sql-to-dbsp-compiler", "--dbsp-override-path=/database-stream-processor"]
525-
SAVE IMAGE ghcr.io/feldera/dbsp-manager
525+
SAVE IMAGE ghcr.io/feldera/pipeline-manager
526526

527527
# TODO: mirrors the Dockerfile. See note above.
528528
build-demo-container:
@@ -545,7 +545,7 @@ test-docker-compose:
545545
COPY deploy/docker-compose.yml .
546546
WITH DOCKER --pull postgres \
547547
--pull docker.redpanda.com/vectorized/redpanda:v23.2.3 \
548-
--load ghcr.io/feldera/dbsp-manager=+build-dbsp-manager-container \
548+
--load ghcr.io/feldera/pipeline-manager=+build-pipeline-manager-container \
549549
--load ghcr.io/feldera/demo-container=+build-demo-container
550550
RUN COMPOSE_HTTP_TIMEOUT=120 SECOPS_DEMO_ARGS="--prepare-args 200000" RUST_LOG=debug,tokio_postgres=info docker-compose -f docker-compose.yml --profile demo up --force-recreate --exit-code-from demo
551551
END
@@ -556,7 +556,7 @@ integration-test-container:
556556
COPY +test-manager/test_binary .
557557
# Check that the binary does indeed run integration tests
558558
RUN ./test_binary integration_test --list | grep integration_test
559-
ENV TEST_DBSP_URL=http://dbsp:8080
559+
ENV TEST_DBSP_URL=http://pipeline-manager:8080
560560
ENTRYPOINT ["./test_binary", "integration_test::"]
561561
SAVE IMAGE itest:latest
562562

@@ -566,10 +566,10 @@ integration-tests:
566566
COPY deploy/docker-compose.yml .
567567
COPY deploy/.env .
568568
WITH DOCKER --pull postgres \
569-
--load ghcr.io/feldera/dbsp-manager=+build-dbsp-manager-container \
569+
--load ghcr.io/feldera/pipeline-manager=+build-pipeline-manager-container \
570570
--compose docker-compose.yml \
571571
--service db \
572-
--service dbsp \
572+
--service pipeline-manager \
573573
--load itest:latest=+integration-test-container
574574
RUN sleep 5 && docker run --env-file .env --network default_default itest:latest
575575
END

‎deploy/docker-compose-dev.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ services:
55
ports:
66
- 6666:5432 # Used for pipeline manager integration tests
77

8-
dbsp:
8+
pipeline-manager:
99
build:
1010
context: ../
1111
dockerfile: deploy/Dockerfile
12-
image: ghcr.io/feldera/dbsp-manager
12+
image: ghcr.io/feldera/pipeline-manager
1313

1414
demo:
1515
build:
1616
context: ../
1717
dockerfile: deploy/Dockerfile
1818
target: client
19-
image: ghcr.io/feldera/demo-container
19+
image: ghcr.io/feldera/demo-container

‎deploy/docker-compose.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ services:
1010
timeout: 5s
1111
retries: 5
1212

13-
dbsp:
13+
pipeline-manager:
1414
tty: true
15-
image: ghcr.io/feldera/dbsp-manager
15+
image: ghcr.io/feldera/pipeline-manager
1616
ports:
1717
- "8085:8080"
1818
depends_on:
@@ -66,7 +66,7 @@ services:
6666
demo:
6767
profiles: ["demo"]
6868
depends_on:
69-
dbsp:
69+
pipeline-manager:
7070
condition: service_started
7171
image: ghcr.io/feldera/demo-container
7272
environment:
@@ -77,4 +77,4 @@ services:
7777
- bash
7878
- -c
7979
# Run the SecOps demo
80-
- "cd demo/project_demo00-SecOps && python3 run.py --dbsp_url http://dbsp:8080 --actions prepare create compile $${SECOPS_DEMO_ARGS}"
80+
- "cd demo/project_demo00-SecOps && python3 run.py --dbsp_url http://pipeline-manager:8080 --actions prepare create compile $${SECOPS_DEMO_ARGS}"

0 commit comments

Comments
 (0)