Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Build images
run: |
make docker-compose
# - name: Build images
# run: |
# make docker-compose
- name: Start services
run: |
MODE=dev make start
sleep 10
- name: Run newman tests
run: |
make check-api
# - name: Run newman tests
# run: |
# make check-api
- name: Stop services
if: always()
run: |
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ check-api: ##@Test Run API tests with newman
cd tests/postman && docker compose up --abort-on-container-exit || (echo "API tests failed $$?"; exit 1)

start-docker-compose:
docker compose -f bootup/docker-compose-files/${COMPOSE_FILE} up -d --force-recreate --remove-orphans
docker compose -f docker-compose.dev.yaml up -d --build --force-recreate --remove-orphans

stop-docker-compose:
echo "Stop all services with bootup/docker-compose-files/${COMPOSE_FILE}..."
Expand All @@ -224,7 +224,7 @@ docker-rest-agent:
docker build -t hyperledger/cello-agent-docker:latest -f build_image/docker/agent/docker-rest-agent/Dockerfile.in ./ --build-arg pip=$(PIP) --platform linux/$(ARCH)

fabric:
docker build -t hyperledger/fabric:2.5.13 -f build_image/docker/cello-hlf/Dockerfile build_image/docker/cello-hlf/
docker build -t hyperledger/fabric:2.5.13 src/nodes/hyperledger-fabric

dashboard:
docker build -t hyperledger/cello-dashboard:latest -f build_image/docker/common/dashboard/Dockerfile.in ./
Expand Down
14 changes: 0 additions & 14 deletions build_image/docker/agent/docker-rest-agent/Dockerfile.in

This file was deleted.

24 changes: 0 additions & 24 deletions build_image/docker/agent/k8s-rest-agent/Dockerfile.in

This file was deleted.

15 changes: 0 additions & 15 deletions build_image/docker/agent/kubernetes/Dockerfile.in

This file was deleted.

17 changes: 0 additions & 17 deletions build_image/docker/common/dashboard/Dockerfile.in

This file was deleted.

5 changes: 0 additions & 5 deletions build_image/docker/common/dashboard/config-nginx.sh

This file was deleted.

27 changes: 0 additions & 27 deletions build_image/docker/common/dashboard/default.conf.tmpl

This file was deleted.

57 changes: 0 additions & 57 deletions build_image/docker/common/dashboard/nginx.conf

This file was deleted.

21 changes: 0 additions & 21 deletions build_image/docker/common/nginx/Dockerfile.in

This file was deleted.

5 changes: 0 additions & 5 deletions build_image/docker/common/nginx/config-nginx.sh

This file was deleted.

62 changes: 0 additions & 62 deletions build_image/docker/common/nginx/nginx.conf.default

This file was deleted.

27 changes: 0 additions & 27 deletions build_image/dockerhub/latest/agent/fabric-operator/Dockerfile

This file was deleted.

22 changes: 0 additions & 22 deletions build_image/dockerhub/latest/agent/kubernetes/Dockerfile

This file was deleted.

25 changes: 0 additions & 25 deletions build_image/dockerhub/latest/common/api-engine/Dockerfile

This file was deleted.

Loading