diff --git a/.editorconfig b/.editorconfig index 64d3d6a..0697a10 100644 --- a/.editorconfig +++ b/.editorconfig @@ -9,4 +9,8 @@ indent_size = 2 end_of_line = lf charset = utf-8 trim_trailing_whitespace = true -insert_final_newline = true \ No newline at end of file +insert_final_newline = true +quote_type = single + +[{Makefile,**.mk}] +indent_style = tab diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index 43f2a38..31a06f8 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -6,7 +6,7 @@ on: - main jobs: - Dockerfile lint: + dockerfile_lint: runs-on: k3s steps: - uses: actions/checkout@v4 @@ -15,7 +15,7 @@ jobs: dockerfile: Dockerfile build: - needs: Dockerfile lint + needs: dockerfile_lint runs-on: k3s steps: - uses: actions/checkout@v4 @@ -24,7 +24,7 @@ jobs: with: image: rogersik/monica registry: gitea.sikorski.cloud - tag: development + tag: '4.1-dev' cache: true username: rogersik password: ${{ secrets.REGISTRY_PASSWORD }} diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml index 897e60d..1775a48 100644 --- a/.gitea/workflows/main.yaml +++ b/.gitea/workflows/main.yaml @@ -5,10 +5,10 @@ on: branches: - main schedule: - - cron: "0 6 * * SUN" + - cron: '0 6 * * SUN' jobs: - Dockerfile lint: + dockerfile_lint: runs-on: k3s steps: - uses: actions/checkout@v4 @@ -17,7 +17,7 @@ jobs: dockerfile: Dockerfile build: - needs: Dockerfile lint + needs: dockerfile_lint runs-on: k3s steps: - uses: actions/checkout@v4 @@ -27,7 +27,7 @@ jobs: with: image: rogersik/monica registry: gitea.sikorski.cloud - tag: 4 + tag: '4.1' # tag_with_latest: true # https://github.com/aevea/action-kaniko/issues/66 cache: true username: rogersik diff --git a/Dockerfile b/Dockerfile index 53c8cf5..df12df6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # https://hub.docker.com/_/monica -FROM monica:4 +FROM monica:4.1 RUN \ # Use the default production configuration