diff --git a/.forgejo/workflows/unlighthouse.yml b/.forgejo/workflows/unlighthouse.yml index 0ede834..1d73688 100644 --- a/.forgejo/workflows/unlighthouse.yml +++ b/.forgejo/workflows/unlighthouse.yml @@ -24,9 +24,7 @@ jobs: - name: Check availability run: | while [ "$(curl -o /dev/null -s -w '%{http_code}' http://website:8081)" -ne 200 ]; - do - status_code=$(curl -o /dev/null -s -w '%{http_code}' http://website:8081); - echo "Failed with ${status_code} ... Waiting for 5 seconds"; + do echo "Waiting..."; sleep 5; done; - name: Run unlighthouse @@ -40,11 +38,6 @@ jobs: with: name: unlighthouse-reports path: unlighthouse-reports/ - - name: Upload start-script - uses: actions/upload-artifact@v3 - with: - name: start - path: start.sh - name: Upload Dockerfile uses: actions/upload-artifact@v3 with: @@ -60,10 +53,6 @@ jobs: uses: actions/download-artifact@v3 with: name: dockerfile - - name: Downloading start script - uses: actions/download-artifact@v3 - with: - name: start - name: Downloading static site artifacts uses: actions/download-artifact@v3 with: diff --git a/Dockerfile b/Dockerfile index e92ecaa..5bb3ab3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,8 +16,6 @@ WORKDIR / COPY --from=build /app/dist /public COPY --from=build /app/serve.json /public/serve.json -COPY --from=build /app/start.sh / -RUN chmod +x start.sh EXPOSE 8081 -CMD ./start.sh +CMD echo "Website version ${version} - powered by @Firq"; serve --listen 8081 --no-clipboard /public diff --git a/Dockerfile.reports b/Dockerfile.reports index 24f4784..819b28d 100644 --- a/Dockerfile.reports +++ b/Dockerfile.reports @@ -5,8 +5,6 @@ ENV version=${version} WORKDIR / ADD reports /public -ADD start.sh / -RUN chmod +x /start.sh EXPOSE 8081 -CMD ./start.sh +CMD echo "Website version ${version} - powered by @Firq"; serve --listen 8081 --no-clipboard /public diff --git a/package-lock.json b/package-lock.json index 1ed6a54..0bfc166 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@firq/fgosite", - "version": "0.2.0-pre.101", + "version": "0.2.0-pre.102", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@firq/fgosite", - "version": "0.2.0-pre.101", + "version": "0.2.0-pre.102", "dependencies": { "@astro-community/astro-embed-youtube": "^0.5.6", "@astrojs/check": "^0.9.4", diff --git a/package.json b/package.json index 67358fd..76a3d32 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@firq/fgosite", "type": "module", - "version": "0.2.0-pre.101", + "version": "0.2.0-pre.102", "private": true, "scripts": { "dev": "astro dev", diff --git a/start.sh b/start.sh deleted file mode 100644 index 8b41697..0000000 --- a/start.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -cd / -echo "Website version: ${version}" -echo "powered by @Firq" -serve --listen 8081 --no-clipboard /public