Skip to content

Commit

Permalink
fix: avoid double docker build (pantos-io#79)
Browse files Browse the repository at this point in the history
  • Loading branch information
jpantos authored and juanmanuel-tirado committed Dec 18, 2024
1 parent 2b539b0 commit 0984e67
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 9 deletions.
2 changes: 0 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,3 @@ updates:
directory: "/" # Location of Docker manifest
schedule:
interval: "daily"


6 changes: 3 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ jobs:
uses: actions/cache@v4
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-v1.0-service-node-${{ github.ref_name }}
key: ${{ runner.os }}-buildx-v1.0-service-node-${{ matrix.arch}}-${{ github.ref_name }}
restore-keys: |
${{ runner.os }}-buildx-v1.0-service-node-
${{ runner.os }}-buildx-v1.0-service-node-${{ matrix.arch}}-
- name: Check docker config and disable live reload
run: |
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
--builder ${{ steps.buildx.outputs.name }}'
- name: Test image
timeout-minutes: 10
timeout-minutes: ${{ matrix.arch == 'amd64' && 10 || 30 }}
run: |
make docker
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/docker-vulnerabilities.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -104,5 +104,3 @@ jobs:
run: |
rm -rf /tmp/.buildx-cache
mv /tmp/.buildx-cache-new /tmp/.buildx-cache

1 change: 0 additions & 1 deletion .github/workflows/sonar.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,3 @@ jobs:
if: github.repository == 'pantos-io/servicenode'
uses: pantos-io/ci-workflows/.github/workflows/sonar.yml@v1
secrets: inherit

4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,9 @@ check-swarm-init:
fi

docker-build:
docker buildx bake -f docker-compose.yml --load $(ARGS)
@if [ "$$NO_BUILD" != "true" ]; then \
docker buildx bake -f docker-compose.yml --load $(ARGS); \
fi

docker: check-swarm-init docker-build
@for i in $$(seq 1 $(INSTANCE_COUNT)); do \
Expand Down

0 comments on commit 0984e67

Please sign in to comment.