Skip to content

Commit

Permalink
Update the docker build workflows (#12)
Browse files Browse the repository at this point in the history
Merging this even if there is one unit test that fails. The code should not be touching this, so hopefully it will work when merged.
  • Loading branch information
sondreb authored Dec 17, 2024
1 parent 9c03a2f commit b4ce1bf
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
12 changes: 8 additions & 4 deletions .github/workflows/on-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,12 @@ jobs:
- name: Add SHORT_SHA env property with commit short sha
run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV

- name: Login to Docker for building
run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
# - name: Login to Docker for building
# run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin

- name: Login to Docker
run: |
docker login -u "sondreb" -p "${{secrets.DOCKER_KEY}}"
- name: Checkout project
uses: actions/checkout@v4
Expand Down Expand Up @@ -99,8 +103,8 @@ jobs:
--cache-from "type=local,src=/tmp/.buildx-cache" \
--cache-to "type=local,dest=/tmp/.buildx-cache" \
--platform linux/amd64,linux/arm64 \
--tag ${{ secrets.DOCKER_HUB_USER }}/${{ matrix.service }}:$TAG \
--tag ${{ secrets.DOCKER_HUB_USER }}/${{ matrix.service }}:latest \
--tag blockcore/mempool-${{ matrix.service }}:$TAG \
--tag blockcore/mempool-${{ matrix.service }}:latest \
--build-context rustgbt=./rust \
--build-context backend=./backend \
--output "type=registry" ./${{ matrix.service }}/ \
Expand Down
2 changes: 1 addition & 1 deletion docker-angor-api/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ services:
LETSENCRYPT_HOST: explorer.angor.io
LETSENCRYPT_EMAIL: [email protected]
ASPNETCORE_URLS: http://+:8080
image: mempool/frontend:latest
image: blockcore/mempool-frontend:latest
user: "0:1000"
restart: always
stop_grace_period: 1m
Expand Down
4 changes: 2 additions & 2 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
environment:
FRONTEND_HTTP_PORT: "8080"
BACKEND_MAINNET_HTTP_HOST: "api"
image: mempool/frontend:latest
image: blockcore/mempool-frontend:latest
user: "1000:1000"
restart: on-failure
stop_grace_period: 1m
Expand All @@ -25,7 +25,7 @@ services:
DATABASE_USERNAME: "mempool"
DATABASE_PASSWORD: "mempool"
STATISTICS_ENABLED: "true"
image: mempool/backend:latest
image: blockcore/mempool-backend:latest
user: "1000:1000"
restart: on-failure
stop_grace_period: 1m
Expand Down

0 comments on commit b4ce1bf

Please sign in to comment.