From f7c63c8705af9896a787f29a767d7ed4194ad1a0 Mon Sep 17 00:00:00 2001 From: Skylar Grant Date: Thu, 1 Oct 2026 14:30:48 -0400 Subject: [PATCH] Tweak dev and prod workflow --- .gitea/workflows/dev-docker.yml | 2 +- .gitea/workflows/production-docker.yml | 2 +- Dockerfile | 15 +++++++++++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/dev-docker.yml b/.gitea/workflows/dev-docker.yml index 4dafc2d..f92994f 100644 --- a/.gitea/workflows/dev-docker.yml +++ b/.gitea/workflows/dev-docker.yml @@ -34,7 +34,7 @@ jobs: - name: Build the Docker image run: | cd /var/lib/act_runner/nodbot - docker build . --file Dockerfile --tag v0idf1sh/nodbot-dev + docker build --target dev . --file Dockerfile --tag v0idf1sh/nodbot - name: Log into Docker Hub run: docker login -u $DHUB_UNAME -p $DHUB_PWORD - name: Push image to Docker Hub diff --git a/.gitea/workflows/production-docker.yml b/.gitea/workflows/production-docker.yml index c405566..460ab4f 100644 --- a/.gitea/workflows/production-docker.yml +++ b/.gitea/workflows/production-docker.yml @@ -33,7 +33,7 @@ jobs: - name: Build the Docker image run: | cd /var/lib/act_runner/nodbot - docker build . --file Dockerfile --tag v0idf1sh/nodbot + docker build --target prod . --file Dockerfile --tag v0idf1sh/nodbot - name: Log into Docker Hub run: docker login -u $DHUB_UNAME -p $DHUB_PWORD - name: Push image to Docker Hub diff --git a/Dockerfile b/Dockerfile index b10bc75..3a5760c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:18 +FROM node:18 AS prod RUN mkdir -p /usr/src/app WORKDIR /usr/src/app @@ -6,4 +6,15 @@ COPY package.json ./ RUN npm install COPY . . # CMD ["/bin/sh", "-c", "node main.js 2> /logs/nodbot.error 1> /logs/nodbot.log"] -CMD ["/bin/sh", "-c", "node main.js 2> /logs/$(date +%Y-%m-%d_%H-%M-%S)-error.txt 1> /logs/$(date +%Y-%m-%d_%H-%M-%S)-status.txt"] \ No newline at end of file +CMD ["/bin/sh", "-c", "node main.js 2> /logs/$(date +%Y-%m-%d_%H-%M-%S)-error.txt 1> /logs/$(date +%Y-%m-%d_%H-%M-%S)-status.txt"] + +# Dev Build +FROM node:18 AS dev +RUN mkdir -p /usr/src/app +WORKDIR /usr/src/app + +COPY package.json ./ +RUN npm install +COPY . . +# Invoke the bot without redirecting STDOUT and STDERR so that docker logs can be used. +CMD ["/bin/sh", "-c", "node main.js"] \ No newline at end of file