Docker improvements (#5093)

2024-10-04 10:25:46 +02:00
parent 52b949daa3
commit 855a546683
8 changed files with 91 additions and 175 deletions
--- a/.github/workflows/docker-base.yaml
+++ b/.github/workflows/docker-base.yaml
@@ -31,9 +31,8 @@ jobs:
              uses: docker/build-push-action@v5
              with:
                  context: .docker
-                  file: .docker/Dockerfile.kimai-base
+                  file: .docker/Dockerfile
                  build-args: |
-                      TIMEZONE=Europe/London
                      BASE=${{ matrix.server }}
                  platforms: linux/amd64,linux/arm64 #,linux/arm/v8,linux/arm/v7,linux/arm/v6
                  tags: |
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -40,7 +40,6 @@ jobs:
                  context: .
                  build-args: |
                      KIMAI=${{ env.kimai_version }}
-                      TIMEZONE=Europe/London
                      BASE=${{ matrix.server }}
                  target: prod
                  platforms: linux/amd64,linux/arm64
@@ -56,7 +55,6 @@ jobs:
                  context: .
                  build-args: |
                      KIMAI=${{ env.kimai_version }}
-                      TIMEZONE=Europe/London
                      BASE=apache
                  target: dev
                  platforms: linux/amd64,linux/arm64