Compare commits
19 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7a90ea863b | |||
| dd87018b8c | |||
| 8680fb8e84 | |||
| ad5133827f | |||
| 144e2cfc9c | |||
| 88477e4b62 | |||
| eb506e7f1b | |||
| edf12ec40b | |||
| 1a353a85ce | |||
| cee4ea98f5 | |||
| cdafc4bd79 | |||
| a9485a4d0a | |||
| d0877dd0a9 | |||
| bad631eeae | |||
| 5915ae2733 | |||
| ab7047b9cd | |||
| 23f87d376a | |||
| ffe9b66886 | |||
| c85b689aed |
@@ -0,0 +1,10 @@
|
|||||||
|
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
|
||||||
|
|
||||||
|
version: 2
|
||||||
|
updates:
|
||||||
|
- package-ecosystem: "npm"
|
||||||
|
directory: "/"
|
||||||
|
schedule:
|
||||||
|
interval: "weekly"
|
||||||
|
|
||||||
|
|
||||||
@@ -5,19 +5,21 @@ on:
|
|||||||
push:
|
push:
|
||||||
tags:
|
tags:
|
||||||
- v1.*
|
- v1.*
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
push_to_registry:
|
push_to_registry:
|
||||||
name: Push Docker Image to Docker Hub
|
name: Push Docker Image to Docker Hub
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Check Out The Repo
|
- name: Checkout
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v5
|
||||||
|
|
||||||
- name: Set up QEMU
|
- name: Setup QEMU
|
||||||
uses: docker/setup-qemu-action@v1
|
uses: docker/setup-qemu-action@v3
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v1
|
uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
- name: Get Smart Tag
|
- name: Get Smart Tag
|
||||||
id: prepare
|
id: prepare
|
||||||
@@ -26,13 +28,13 @@ jobs:
|
|||||||
docker_image: krgamestudios/news-server
|
docker_image: krgamestudios/news-server
|
||||||
|
|
||||||
- name: Login to DockerHub
|
- name: Login to DockerHub
|
||||||
uses: docker/login-action@v1
|
uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKER_USERNAME }}
|
username: ${{ secrets.DOCKER_USERNAME }}
|
||||||
password: ${{ secrets.DOCKER_PASSWORD }}
|
password: ${{ secrets.DOCKER_PASSWORD }}
|
||||||
|
|
||||||
- name: Push to Docker Hub
|
- name: Push to Docker Hub
|
||||||
uses: docker/build-push-action@v2
|
uses: docker/build-push-action@v6
|
||||||
with:
|
with:
|
||||||
push: true
|
push: true
|
||||||
tags: ${{ steps.prepare.outputs.tag }}
|
tags: ${{ steps.prepare.outputs.tag }}
|
||||||
|
|||||||
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
FROM node:22-bookworm-slim
|
FROM node:22-bookworm-slim
|
||||||
WORKDIR "/app"
|
WORKDIR "/app"
|
||||||
COPY package*.json /app
|
COPY package*.json /app
|
||||||
RUN npm install --production
|
RUN npm install --omit=dev
|
||||||
COPY . /app
|
COPY . /app
|
||||||
EXPOSE 3100
|
EXPOSE 3100
|
||||||
USER node
|
USER node
|
||||||
|
|||||||
+1
-1
@@ -139,7 +139,7 @@ networks:
|
|||||||
FROM node:22-bookworm-slim
|
FROM node:22-bookworm-slim
|
||||||
WORKDIR "/app"
|
WORKDIR "/app"
|
||||||
COPY package*.json /app
|
COPY package*.json /app
|
||||||
RUN npm install --production
|
RUN npm install --omit=dev
|
||||||
COPY . /app
|
COPY . /app
|
||||||
EXPOSE ${appPort}
|
EXPOSE ${appPort}
|
||||||
USER node
|
USER node
|
||||||
|
|||||||
Generated
+659
-543
File diff suppressed because it is too large
Load Diff
+9
-9
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "news-server",
|
"name": "news-server",
|
||||||
"version": "1.7.1",
|
"version": "1.7.5",
|
||||||
"description": "An API centric news server. Uses Sequelize and mariaDB by default.",
|
"description": "An API centric news server. Uses Sequelize and mariaDB by default.",
|
||||||
"main": "server/server.js",
|
"main": "server/server.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@@ -19,15 +19,15 @@
|
|||||||
},
|
},
|
||||||
"homepage": "https://github.com/krgamestudios/news-server#readme",
|
"homepage": "https://github.com/krgamestudios/news-server#readme",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"cors": "^2.8.5",
|
"cors": "^2.8.6",
|
||||||
"dotenv": "^16.4.5",
|
"dotenv": "^17.4.2",
|
||||||
"express": "^4.19.2",
|
"express": "^5.2.1",
|
||||||
"jsonwebtoken": "^9.0.2",
|
"jsonwebtoken": "^9.0.3",
|
||||||
"mariadb": "^3.3.0",
|
"mariadb": "^3.5.2",
|
||||||
"markdown-it": "^14.1.0",
|
"markdown-it": "^14.1.1",
|
||||||
"sequelize": "^6.37.3"
|
"sequelize": "^6.37.8"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"nodemon": "^3.1.0"
|
"nodemon": "^3.1.14"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,10 +12,10 @@ const edit = require('./edit');
|
|||||||
const remove = require('./remove');
|
const remove = require('./remove');
|
||||||
|
|
||||||
//basic route management (all query possibilities)
|
//basic route management (all query possibilities)
|
||||||
router.get('/:id(\\d+)?', cors(), query(false, false));
|
router.get('/{:id}', cors(), query(false, false));
|
||||||
router.get('/archive/:id(\\d+)?', cors(), query(true, false));
|
router.get('/archive/{:id}', cors(), query(true, false));
|
||||||
router.get('/metadata/:id(\\d+)?', cors(), query(false, true));
|
router.get('/metadata/{:id}', cors(), query(false, true));
|
||||||
router.get('/archive/metadata/:id(\\d+)?', cors(), query(true, true));
|
router.get('/archive/metadata/{:id}', cors(), query(true, true));
|
||||||
|
|
||||||
//use middleware to authenticate the rest of the routes
|
//use middleware to authenticate the rest of the routes
|
||||||
router.use(cors({
|
router.use(cors({
|
||||||
@@ -37,7 +37,7 @@ router.use((req, res, next) => {
|
|||||||
|
|
||||||
//authenticated routes
|
//authenticated routes
|
||||||
router.post('/', publish);
|
router.post('/', publish);
|
||||||
router.patch('/:id(\\d+)', edit);
|
router.patch('/{:id}', edit);
|
||||||
router.delete('/:id(\\d+)', remove);
|
router.delete('/{:id}', remove);
|
||||||
|
|
||||||
module.exports = router;
|
module.exports = router;
|
||||||
|
|||||||
+1
-1
@@ -16,7 +16,7 @@ const database = require('./database');
|
|||||||
app.use('/news', require('./news'));
|
app.use('/news', require('./news'));
|
||||||
|
|
||||||
//error on access
|
//error on access
|
||||||
app.get('*', (req, res) => {
|
app.get('/{*any}', (req, res) => {
|
||||||
res.redirect('https://github.com/krgamestudios/news-server');
|
res.redirect('https://github.com/krgamestudios/news-server');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user