From eebe47c8be89e858464203e3b8de4e1fe8f3b062 Mon Sep 17 00:00:00 2001
From: Yota Hamada <yohamta@gmail.com>
Date: Thu, 7 Nov 2024 19:49:31 +0900
Subject: [PATCH 1/2] chore: update dockerfile

---
 Dockerfile                     | 13 +++---
 docs/source/docker-compose.rst |  3 ++
 docs/source/docker.rst         | 85 ++++++++++++++++++++--------------
 examples/docker-compose.yaml   |  3 ++
 4 files changed, 64 insertions(+), 40 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ee5a4bde5..ab3675b3f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,17 +38,17 @@ RUN apk update; \
     addgroup -g ${USER_GID} ${USER}; \
     adduser ${USER} -h /home/${USER} -u ${USER_UID} -G ${USER} -D -s /bin/ash; \
     echo ${USER} ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/${USER}; \
-    chmod 0440 /etc/sudoers.d/${USER};
-
-USER ${USER}
-WORKDIR /home/${USER}
+    chmod 0440 /etc/sudoers.d/${USER}; \
+    mkdir -p .config/dagu/dags; \
+    chown -R ${USER}:${USER} /home/${USER};
 
 COPY --from=go-builder /app/bin/dagu /usr/local/bin/
 
-RUN mkdir -p .config/dagu/dags
+USER ${USER}
+WORKDIR /home/${USER}
 
 # Add the hello_world.yaml file
-COPY <<EOF .config/dagu/dags/hello_world.yaml
+COPY --chown=${USER}:${USER} <<EOF .config/dagu/dags/hello_world.yaml
 schedule: "* * * * *"
 steps:
   - name: hello world
@@ -59,6 +59,7 @@ EOF
 
 ENV DAGU_HOST=0.0.0.0
 ENV DAGU_PORT=8080
+ENV DAGU_TZ="Etc/UTC"
 
 EXPOSE 8080
 
diff --git a/docs/source/docker-compose.rst b/docs/source/docker-compose.rst
index da03a9b4e..065e5aa1f 100644
--- a/docs/source/docker-compose.rst
+++ b/docs/source/docker-compose.rst
@@ -20,6 +20,7 @@ To automate DAG executions based on cron expressions, it is necessary to run bot
           image: "ghcr.io/dagu-org/dagu:latest"
           environment:
               - DAGU_PORT=8080
+              - DAGU_TZ=Asia/Tokyo
           restart: unless-stopped
           ports:
               - "8080:8080"
@@ -32,6 +33,8 @@ To automate DAG executions based on cron expressions, it is necessary to run bot
       # scheduler process
       scheduler:
           image: "ghcr.io/dagu-org/dagu:latest"
+          environment:
+              - DAGU_TZ=Asia/Tokyo
           restart: unless-stopped
           volumes:
               - dagu_config:/home/dagu/.config/dagu
diff --git a/docs/source/docker.rst b/docs/source/docker.rst
index 685f77681..fc63c3182 100644
--- a/docs/source/docker.rst
+++ b/docs/source/docker.rst
@@ -1,57 +1,74 @@
 Building Docker Image
 =====================
 
-Create the ``Dockerfile`` and you can build an image.
+Example Dockerfile for building a multi-platform image:
 
 .. code-block:: dockerfile
 
     # syntax=docker/dockerfile:1.4
-    FROM --platform=$BUILDPLATFORM alpine:latest
 
+    # Stage 1: UI Builder
+    FROM --platform=$BUILDPLATFORM node:18-alpine as ui-builder
+
+    WORKDIR /app
+    COPY ui/ ./
+
+    RUN rm -rf node_modules; \
+        yarn install --frozen-lockfile --non-interactive; \
+        yarn build
+
+    # Stage 2: Go Builder
+    FROM --platform=$TARGETPLATFORM golang:1.22-alpine as go-builder
+
+    ARG LDFLAGS
+    ARG TARGETOS
     ARG TARGETARCH
-    ARG VERSION=
-    ARG RELEASES_URL="https://github.com/dagu-org/dagu/releases"
+
+    WORKDIR /app
+    COPY . .
+
+    RUN go mod download && rm -rf frontend/assets
+    COPY --from=ui-builder /app/dist/ ./internal/frontend/assets/
+
+    RUN GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags="${LDFLAGS}" -o ./bin/dagu .
+
+    # Stage 3: Final Image
+    FROM --platform=$TARGETPLATFORM alpine:latest
 
     ARG USER="dagu"
     ARG USER_UID=1000
     ARG USER_GID=$USER_UID
 
-    EXPOSE 8080
+    # Create user and set permissions
+    RUN apk update; \
+        apk add --no-cache sudo tzdata; \
+        addgroup -g ${USER_GID} ${USER}; \
+        adduser ${USER} -h /home/${USER} -u ${USER_UID} -G ${USER} -D -s /bin/ash; \
+        echo ${USER} ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/${USER}; \
+        chmod 0440 /etc/sudoers.d/${USER}; \
+        mkdir -p .config/dagu/dags; \
+        chown -R ${USER}:${USER} /home/${USER};
 
-    RUN <<EOF
-        #User and permissions setup
-        apk update
-        apk add --no-cache sudo tzdata
-        addgroup -g ${USER_GID} ${USER}
-        adduser ${USER} -h /home/${USER} -u ${USER_UID} -G ${USER} -D -s /bin/ash
-        echo ${USER} ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/${USER}
-        chmod 0440 /etc/sudoers.d/${USER}
-    EOF
+    COPY --from=go-builder /app/bin/dagu /usr/local/bin/
+
+    USER ${USER}
+    WORKDIR /home/${USER}
 
-    USER dagu
-    WORKDIR /home/dagu
-    RUN <<EOF
-        #dagu binary setup
-        if [ "${TARGETARCH}" == "amd64" ]; then 
-            arch="x86_64";
-        else 
-            arch="${TARGETARCH}"
-        fi
-        export TARGET_FILE="dagu_${VERSION}_Linux_${arch}.tar.gz"
-        wget ${RELEASES_URL}/download/v${VERSION}/${TARGET_FILE}
-        tar -xf ${TARGET_FILE} && rm *.tar.gz 
-        sudo mv dagu /usr/local/bin/ 
-        mkdir .dagu
+    # Add the hello_world.yaml file
+    COPY --chown=${USER}:${USER} <<EOF .config/dagu/dags/hello_world.yaml
+    schedule: "* * * * *"
+    steps:
+      - name: hello world
+        command: sh
+        script: |
+          echo "Hello, world!"
     EOF
 
     ENV DAGU_HOST=0.0.0.0
     ENV DAGU_PORT=8080
+    ENV DAGU_TZ="Etc/UTC"
 
-    CMD dagu server
+    EXPOSE 8080
 
-For example::
+    CMD ["dagu", "start-all"]
 
-    DAGU_VERSION=<X.X.X>
-    docker build -t dagu:${DAGU_VERSION} \
-    --build-arg VERSION=${DAGU_VERSION} \
-    --no-cache .
diff --git a/examples/docker-compose.yaml b/examples/docker-compose.yaml
index ec3f3dde1..82dcdfe1e 100644
--- a/examples/docker-compose.yaml
+++ b/examples/docker-compose.yaml
@@ -13,6 +13,7 @@ services:
         image: "ghcr.io/dagu-org/dagu:latest"
         environment:
             - DAGU_PORT=8080
+            - DAGU_TZ=Asia/Tokyo
         restart: unless-stopped
         ports:
             - "8080:8080"
@@ -24,6 +25,8 @@ services:
     # scheduler process
     scheduler:
         image: "ghcr.io/dagu-org/dagu:latest"
+        environment:
+            - DAGU_TZ=Asia/Tokyo
         restart: unless-stopped
         volumes:
             - dagu_config:/home/dagu/.config/dagu

From 0621a6d4a930be358abbda8deab30cb239a3cf36 Mon Sep 17 00:00:00 2001
From: Yota Hamada <yohamta@gmail.com>
Date: Thu, 7 Nov 2024 19:59:53 +0900
Subject: [PATCH 2/2] docs: Update docker command

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 225a71a74..43ed4a25c 100644
--- a/README.md
+++ b/README.md
@@ -178,9 +178,12 @@ docker run \
 -p 8080:8080 \
 -v $HOME/.config/dagu/dags:/home/dagu/.config/dagu/dags \
 -v $HOME/.local/share/dagu:/home/dagu/.local/share/dagu \
+-e DAGU_TZ=Asia/Tokyo \
 ghcr.io/dagu-org/dagu:latest dagu start-all
 ```
 
+Note: The environment variable `DAGU_TZ` is the timezone for the scheduler and server. You can set it to your local timezone.
+
 See [Environment variables](https://dagu.readthedocs.io/en/latest/config.html#environment-variables) to configure those default directories.
 
 ## **Quick Start Guide**