Simplify build process

Leantime · Feb 19, 2025 · fa8f08d · fa8f08d
1 parent 8072b17
commit fa8f08d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -32,7 +32,9 @@ jobs:
 
     - name: Build and push
       run: |
-        docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v8 --tag leantime/leantime:${{ github.event.inputs.tag }} .
+        docker buildx build --build-arg LEAN_VERSION=${{ github.event.inputs.version }} \
+          --push --platform linux/amd64,linux/arm64,linux/arm/v8 \
+          --tag leantime/leantime:${{ github.event.inputs.version }} .
 
     - name: Create and push manifest for latest
       run: |

diff --git a/Dockerfile b/Dockerfile
@@ -97,7 +97,7 @@ COPY start.sh /start.sh
 RUN chmod +x /start.sh
 
 # Install Leantime
-ARG LEAN_VERSION=3.4.1
+ARG LEAN_VERSION
 RUN set -ex; \
     curl -fsSL --retry 3 /~https://github.com/Leantime/leantime/releases/download/v${LEAN_VERSION}/Leantime-v${LEAN_VERSION}.tar.gz -o leantime.tar.gz && \
     tar xzf leantime.tar.gz --strip-components 1 && \

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -18,7 +18,11 @@ services:
       retries: 3
 
   leantime:
-    image: leantime/leantime:latest
+    build:
+      context: .
+      args:
+        LEAN_VERSION: ${LEAN_VERSION:-latest}  # Use env variable or default to 'latest'
+    image: leantime/leantime:${LEAN_VERSION:-latest}
     #user: "www-data"                                        # Run as non-root user
     restart: unless-stopped
     env_file: ./.env                                        # Environment file with settings