From fd39a92ac7fee10eb190e7883bd36ef1b8d37dba Mon Sep 17 00:00:00 2001 From: Shahrad Elahi Date: Wed, 29 May 2024 20:03:02 +0330 Subject: [PATCH] fix --- .github/workflows/ci.yml | 2 +- .prettierrc | 6 ++++++ Dockerfile | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c609541..a32d361 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,4 +63,4 @@ jobs: file: ./Dockerfile push: ${{ github.event_name != 'pull_request' }} platforms: '${{ env.BUILD_PLATFORMS }}' - tags: "${{ env.GHCR_SLUG }}:${{ env.TAG }},${{ env.DOCKERHUB_SLUG }}:${{ env.TAG }}" + tags: '${{ env.GHCR_SLUG }}:${{ env.TAG }},${{ env.DOCKERHUB_SLUG }}:${{ env.TAG }}' diff --git a/.prettierrc b/.prettierrc index bf01dfd..06aa8a9 100644 --- a/.prettierrc +++ b/.prettierrc @@ -21,6 +21,12 @@ "parser": "svelte", "plugins": ["prettier-plugin-svelte"] } + }, + { + "files": "Dockerfile", + "options": { + "spaceRedirects": false + } } ], "importOrder": ["", "", "^types$", "^\\$lib/(.*)$", "^@/(.*)$", "", "^[./]"], diff --git a/Dockerfile b/Dockerfile index a4d0bb6..7a5c642 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG NODE_VERSION=20 FROM --platform=$BUILDPLATFORM node:${NODE_VERSION}-alpine${ALPINE_VERSION} as node ENV TZ=UTC -RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ >/etc/timezone RUN apk update \ && apk upgrade \ && apk add -U --no-cache \ @@ -24,7 +24,7 @@ RUN apk update \ make \ && rm -rf /var/cache/apk/* SHELL ["/bin/bash", "-c"] -RUN << EOT +RUN < /etc/crontabs/root +RUN echo '* * * * * /usr/bin/env logrotate /etc/logrotate.d/rotator' >/etc/crontabs/root # Setup entrypoint COPY docker-entrypoint.sh /entrypoint.sh