Compare commits

..

No commits in common. "main" and "v3.6.1-dev-citest" have entirely different histories.

5 changed files with 18 additions and 18 deletions

View File

@ -34,7 +34,7 @@ jobs:
- name: Build the Docker image - name: Build the Docker image
run: | run: |
cd /var/lib/act_runner/nodbot cd /var/lib/act_runner/nodbot
docker build --target dev . --file Dockerfile --tag v0idf1sh/nodbot:dev docker build --target dev . --file Dockerfile --tag v0idf1sh/nodbot
- name: Log into Docker Hub - name: Log into Docker Hub
run: docker login -u $DHUB_UNAME -p $DHUB_PWORD run: docker login -u $DHUB_UNAME -p $DHUB_PWORD
- name: Push image to Docker Hub - name: Push image to Docker Hub

View File

@ -33,7 +33,7 @@ jobs:
- name: Build the Docker image - name: Build the Docker image
run: | run: |
cd /var/lib/act_runner/nodbot cd /var/lib/act_runner/nodbot
docker build --target prod . --file Dockerfile --tag v0idf1sh/nodbot:prod docker build --target prod . --file Dockerfile --tag v0idf1sh/nodbot
- name: Log into Docker Hub - name: Log into Docker Hub
run: docker login -u $DHUB_UNAME -p $DHUB_PWORD run: docker login -u $DHUB_UNAME -p $DHUB_PWORD
- name: Push image to Docker Hub - name: Push image to Docker Hub

View File

@ -1,3 +1,13 @@
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 # Dev Build
FROM node:18 AS dev FROM node:18 AS dev
RUN mkdir -p /usr/src/app RUN mkdir -p /usr/src/app
@ -7,14 +17,4 @@ COPY package.json ./
RUN npm install RUN npm install
COPY . . COPY . .
# Invoke the bot without redirecting STDOUT and STDERR so that docker logs can be used. # Invoke the bot without redirecting STDOUT and STDERR so that docker logs can be used.
CMD ["/bin/sh", "-c", "node main.js"] 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"]

View File

@ -13,7 +13,7 @@ module.exports = {
try { try {
fn.upload.request(requester, requestText, messageUrl, message.client); fn.upload.request(requester, requestText, messageUrl, message.client);
// Set the content to sent a text embed notifying the user of success // Set the content to sent a text embed notifying the user of success
commandData.content = `Your request has been submitted!\nRequest: ${requestText}`; commandData.content = `Your request has been submitted!\nRequest: ${request}`;
const replyEmbed = fn.embeds.text(commandData); const replyEmbed = fn.embeds.text(commandData);
message.reply({ embeds: [ replyEmbed ]}); message.reply({ embeds: [ replyEmbed ]});
} catch(err) { } catch(err) {
@ -22,8 +22,8 @@ module.exports = {
const replyEmbed = fn.embeds.text(commandData); const replyEmbed = fn.embeds.text(commandData);
message.reply({ embeds: [ replyEmbed ]}); message.reply({ embeds: [ replyEmbed ]});
const errorEmbed = fn.embeds.error(`An error has occurred in command ${this.name}:\n${err}`); const errorEmbed = fn.embeds.error(`An error has occurred in command ${this.name}:\n${JSON.stringify(err)}`);
fn.sendAlert(errorEmbed, message.client); fn.sendAlert(errorEmbed);
} }
}, },
}; };

View File

@ -465,7 +465,7 @@ const functions = {
error(errorText) { error(errorText) {
const errorEmbed = new Discord.MessageEmbed() const errorEmbed = new Discord.MessageEmbed()
.setAuthor({ name: "Error!" }) .setAuthor({ name: "Error!" })
.setDescription(errorText) .setDescription({ text: errorText })
.setFooter({ text: appVersion }); .setFooter({ text: appVersion });
return errorEmbed; return errorEmbed;
@ -921,7 +921,7 @@ const functions = {
const errorId = digits.join(""); const errorId = digits.join("");
return errorId; return errorId;
}, },
async sendAlert(embed, client) { async sendAlert(embed) {
const statusChannel = await client.channels.fetch(statusChannelId) const statusChannel = await client.channels.fetch(statusChannelId)
.catch(err => { .catch(err => {
console.error(err); console.error(err);