From 211e07f5f0c0edb51d5ae5ed013261e7d50c9d04 Mon Sep 17 00:00:00 2001 From: Skylar Grant Date: Thu, 1 Oct 2026 15:15:09 -0400 Subject: [PATCH] Fix tagging system --- .gitea/workflows/dev-docker.yml | 2 +- .gitea/workflows/production-docker.yml | 2 +- Dockerfile | 22 +++++++++++----------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitea/workflows/dev-docker.yml b/.gitea/workflows/dev-docker.yml index 04aec85..9a84d3a 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 --target dev . --file Dockerfile --tag v0idf1sh/nodbot + docker build --target dev . --file Dockerfile --tag v0idf1sh/nodbot:dev - 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 e671884..ff4f6ac 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 --target prod . --file Dockerfile --tag v0idf1sh/nodbot + docker build --target prod . --file Dockerfile --tag v0idf1sh/nodbot:prod - 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 3a5760c..a977f65 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,3 @@ -FROM node:18 AS prod -RUN mkdir -p /usr/src/app -WORKDIR /usr/src/app - -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"] - # Dev Build FROM node:18 AS dev RUN mkdir -p /usr/src/app @@ -17,4 +7,14 @@ 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 +CMD ["/bin/sh", "-c", "node main.js"] + +FROM node:18 AS prod +RUN mkdir -p /usr/src/app +WORKDIR /usr/src/app + +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