A local-first personal finance app
fix healthcheck script (#7840)
Matt Fiddaman36e5cb17f5bd
diff --git a/.github/workflows/docker-edge.yml b/.github/workflows/docker-edge.ymlindex d20b448fa7..70f4c760c8 100644--- a/.github/workflows/docker-edge.yml+++ b/.github/workflows/docker-edge.yml@@ -91,10 +91,15 @@ jobs:tags: actualbudget/actual-server-testing- name: Test that the docker image boots+ timeout-minutes: 1run: |- docker run --detach --network=host actualbudget/actual-server-testing- sleep 10- curl --fail -sS -LI -w '%{http_code}\n' --retry 20 --retry-delay 1 --retry-connrefused localhost:5006+ docker run --detach --network=host --name actual-server actualbudget/actual-server-testing+ HEALTHCMD=$(yq -r '.services.actual_server.healthcheck.test[1]' packages/sync-server/docker-compose.yml)+ until docker exec actual-server sh -c "$HEALTHCMD"; do sleep 1; done++ - name: Dump container logs on failure+ if: failure()+ run: docker logs actual-server || true# This will use the cache from the earlier build step and not rebuild the image# https://docs.docker.com/build/ci/github-actions/test-before-push/diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.ymlindex eb46302c06..a08f24d47d 100644--- a/.github/workflows/docker-release.yml+++ b/.github/workflows/docker-release.yml@@ -87,6 +87,23 @@ jobs:- name: Build Webrun: yarn build:server+ - name: Build ubuntu image for testing+ uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0+ with:+ context: .+ push: false+ load: true+ file: packages/sync-server/docker/ubuntu.Dockerfile+ tags: actualbudget/actual-server-testing++ - name: Test that the ubuntu image boots+ timeout-minutes: 1+ run: |+ docker rm -f actual-server 2>/dev/null || true+ docker run --detach --network=host --name actual-server actualbudget/actual-server-testing+ HEALTHCMD=$(yq -r '.services.actual_server.healthcheck.test[1]' packages/sync-server/docker-compose.yml)+ until docker exec actual-server sh -c "$HEALTHCMD"; do sleep 1; done+- name: Build and push ubuntu imageuses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0with:@@ -96,6 +113,23 @@ jobs:platforms: linux/amd64,linux/arm64,linux/arm/v7tags: ${{ steps.meta.outputs.tags }}+ - name: Build alpine image for testing+ uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0+ with:+ context: .+ push: false+ load: true+ file: packages/sync-server/docker/alpine.Dockerfile+ tags: actualbudget/actual-server-testing++ - name: Test that the alpine image boots+ timeout-minutes: 1+ run: |+ docker rm -f actual-server 2>/dev/null || true+ docker run --detach --network=host --name actual-server actualbudget/actual-server-testing+ HEALTHCMD=$(yq -r '.services.actual_server.healthcheck.test[1]' packages/sync-server/docker-compose.yml)+ until docker exec actual-server sh -c "$HEALTHCMD"; do sleep 1; done+- name: Build and push alpine imageuses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0with:@@ -104,3 +138,7 @@ jobs:file: packages/sync-server/docker/alpine.Dockerfileplatforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6tags: ${{ steps.alpine-meta.outputs.tags }}++ - name: Dump container logs on failure+ if: failure()+ run: docker logs actual-server || truediff --git a/packages/sync-server/docker-compose.yml b/packages/sync-server/docker-compose.ymlindex ea713772a2..c72e8a7b99 100644--- a/packages/sync-server/docker-compose.yml+++ b/packages/sync-server/docker-compose.yml@@ -21,9 +21,9 @@ services:- ./actual-data:/datahealthcheck:# Enable health check for the instance- test: ['CMD-SHELL', 'node src/scripts/health-check.js']+ test: ['CMD-SHELL', 'node scripts/health-check.js']# health check using self signed certs- # test: ['CMD-SHELL', 'NODE_EXTRA_CA_CERTS=/data/selfhost.crt node src/scripts/health-check.js']+ # test: ['CMD-SHELL', 'NODE_EXTRA_CA_CERTS=/data/selfhost.crt node scripts/health-check.js']interval: 60stimeout: 10sretries: 3diff --git a/packages/sync-server/docker/alpine.Dockerfile b/packages/sync-server/docker/alpine.Dockerfileindex 0c8fa8e560..9866feb955 100644--- a/packages/sync-server/docker/alpine.Dockerfile+++ b/packages/sync-server/docker/alpine.Dockerfile@@ -46,6 +46,9 @@ COPY --from=builder /app/node_modules ./node_modulesCOPY --from=builder /app/packages/sync-server/package.json ./COPY --from=builder /app/packages/sync-server/build ./+# script dir changed when we swapped build method, add the legacy dir in for compatibility+RUN mkdir -p src && ln -s ../scripts src/scripts+ENTRYPOINT ["/sbin/tini","-g", "--"]EXPOSE 5006CMD ["node", "app.js"]diff --git a/packages/sync-server/docker/ubuntu.Dockerfile b/packages/sync-server/docker/ubuntu.Dockerfileindex 3bf9789230..d73860f891 100644--- a/packages/sync-server/docker/ubuntu.Dockerfile+++ b/packages/sync-server/docker/ubuntu.Dockerfile@@ -46,6 +46,9 @@ COPY --from=builder /app/node_modules ./node_modulesCOPY --from=builder /app/packages/sync-server/package.json ./COPY --from=builder /app/packages/sync-server/build ./+# script dir changed when we swapped build method, add the legacy dir in for compatibility+RUN mkdir -p src && ln -s ../scripts src/scripts+ENTRYPOINT ["/usr/bin/tini","-g", "--"]EXPOSE 5006CMD ["node", "app.js"]diff --git a/upcoming-release-notes/7840.md b/upcoming-release-notes/7840.mdnew file mode 100644index 0000000000..24d75e24e2--- /dev/null+++ b/upcoming-release-notes/7840.md@@ -0,0 +1,6 @@+---+category: Bugfixes+authors: [matt-fidd]+---++Fix docker healthcheck script and add backwards compatibility