Compare commits

...

6 Commits

Author SHA1 Message Date
Kayne Ruse f919af4248 Tweaked forkflow file 2021-03-04 09:39:49 +11:00
Kayne Ruse 4a74bac620 Added a delay to server start 2021-03-04 09:29:59 +11:00
Kayne Ruse 2710b0e014 BUGFIX: Wasn't cooperating on MERN-template deployment 2021-03-04 09:05:48 +11:00
Kayne Ruse de57c6e18a Actually upgraded github workflow 2021-02-22 05:29:38 +11:00
Kayne Ruse 68b96dfb82 Expanding supported platforms 2021-02-22 05:09:44 +11:00
Kayne Ruse 9dfe5207d9 Updated github workflow 2021-02-22 04:31:52 +11:00
5 changed files with 34 additions and 11 deletions
+27 -6
View File
@@ -2,17 +2,38 @@ name: Publish Docker image
on: on:
release: release:
types: [ published ] types: [ published ]
push:
tags:
- v1.*
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: Check Out The Repo
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Push to Docker Hub
uses: docker/build-push-action@v1 - name: Set up QEMU
uses: docker/setup-qemu-action@v1
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Get Smart Tag
id: prepare
uses: Surgo/docker-smart-tag-action@v1
with:
docker_image: krgamestudios/news-server
- name: Login to DockerHub
uses: docker/login-action@v1
with: with:
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }} password: ${{ secrets.DOCKER_PASSWORD }}
repository: krgamestudios/news-server
tag_with_ref: true - name: Push to Docker Hub
uses: docker/build-push-action@v2
with:
push: true
tags: ${{ steps.prepare.outputs.tag }}
platforms: amd64,arm
+2 -1
View File
@@ -15,4 +15,5 @@ EXPOSE 3100
USER node USER node
ENTRYPOINT ["npm", "start"] ENTRYPOINT ["bash", "-c"]
CMD ["sleep 10 && npm start"]
+1 -3
View File
@@ -4,9 +4,7 @@ const sequelize = new Sequelize(process.env.DB_DATABASE, process.env.DB_USERNAME
host: process.env.DB_HOSTNAME, host: process.env.DB_HOSTNAME,
dialect: 'mariadb', dialect: 'mariadb',
timezone: process.env.DB_TIMEZONE, timezone: process.env.DB_TIMEZONE,
logging: false // logging: false
}); });
sequelize.sync();
module.exports = sequelize; module.exports = sequelize;
+2
View File
@@ -3,6 +3,8 @@ const sequelize = require('..');
const articles = require('./articles'); const articles = require('./articles');
sequelize.sync();
const revisions = sequelize.define('revisions', { const revisions = sequelize.define('revisions', {
title: { title: {
type: Sequelize.TEXT, type: Sequelize.TEXT,
+2 -1
View File
@@ -24,6 +24,7 @@ app.get('*', (req, res) => {
}); });
//startup //startup
server.listen(process.env.WEB_PORT || 3100, (err) => { server.listen(process.env.WEB_PORT || 3100, async (err) => {
await database.sync();
console.log(`listening to localhost:${process.env.WEB_PORT || 3100}`); console.log(`listening to localhost:${process.env.WEB_PORT || 3100}`);
}); });