Skip to content

Commit

Permalink
Merge pull request #9 from fullstacktf/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
delirial authored Aug 9, 2019
2 parents 03f2fde + c9ee245 commit 74e1ad5
Show file tree
Hide file tree
Showing 40 changed files with 8,384 additions and 40 deletions.
52 changes: 26 additions & 26 deletions .github/settings.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repository:
name: myment-front
description: Myment Travel app FrontEnd
name: myment_back
description: Myment Travel Web App back-end
homepage:
topics:
private: true
Expand All @@ -11,91 +11,91 @@ repository:
allow_squash_merge: true
allow_merge_commit: true
labels:
- name: "bug"
- name: 'bug'
color: CC0000
description: An issue with the system bug

- name: "enhancement"
- name: 'enhancement'
color: 83b8e8
description: An issue to enhancement the system ⚙️.

- name: "question"
- name: 'question'
color: cd237b
description: An issue to maintenance the system.

- name: "feature"
- name: 'feature'
color: 336699
description: New functionality.

- name: "discussion"
- name: 'discussion'
color: ddd8cc
description: we haven't reached a consensus there, maybe you can contribute?
- name: "feedback"

- name: 'feedback'
color: fcc73a
description: General feedback more than bug reports or feature requests.
- name: "help-wanted"

- name: 'help-wanted'
color: 46E251
description: The FullStacktf core team would appreciate help from the community in resolving these issues.

- name: "more-information-needed"
- name: 'more-information-needed'
color: 8A46E2
description: More information needs to be collected about these problems or feature requests (e.g. steps to reproduce).

- name: "needs-reproduction"
- name: 'needs-reproduction'
color: C346E2
description: Likely bugs, but haven't been reliably reproduced

- name: "duplicate"
- name: 'duplicate'
color: 74b566
description: Issues which are duplicates of other issues, i.e. they have been reported before.

- name: "blocked"
- name: 'blocked'
color: FA0415
description: Issues blocked on other issues.

- name: "wontfix"
- name: 'wontfix'
color: 04B0FA
description: The FullStacktf core team has decided not to fix these issues for now, either because they're working as intended or for some other reason.

- name: "invalid"
- name: 'invalid'
color: FAD104
description: Issues which aren't valid (e.g. user errors).

- name: "work-in-progress"
- name: 'work-in-progress'
color: 6F04FA
description: Pull requests which are still being worked on, more changes will follow.

- name: "needs-review"
- name: 'needs-review'
color: FA0425
description: Pull requests which need code review, and approval from maintainers or FullStacktf core team.

- name: "under-review"
- name: 'under-review'
color: 04FAFA
description: Pull requests being reviewed by maintainers or FullStacktf core team.

- name: "requires-changes"
- name: 'requires-changes'
color: FA7F04
description: Pull requests which need to be updated based on review comments and then reviewed again.

- name: "needs-testing"
- name: 'needs-testing'
color: 3EFA04
description: Pull requests which need manual testing.

- name: "Priority: Critical"
- name: 'Priority: Critical'
color: e2002a
description: Critical priority tasks that should be done ASAP

- name: "Priority: High"
- name: 'Priority: High'
color: ec5b30
description: High priority tasks that can be done when there's no critical priority tasks

- name: "Priority: Medium"
- name: 'Priority: Medium'
color: fcc73a
description: medium priority tasks that can be done when there's no High priority tasks

- name: "Priority: Low"
- name: 'Priority: Low'
color: 009922
description: low priority tasks that can be done when there's no medium priority tasks

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
node_modules
.cache
6 changes: 6 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"trailingComma": "all",
"tabWidth": 2,
"semi": true,
"singleQuote": true
}
44 changes: 38 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,42 @@
FROM node:10-alpine

FROM node:10-alpine as express
LABEL Delirial [email protected]
LABEL version="1.0"
LABEL description="API backend for testing \
and developed on Node+Express+Mongo. \
--- Postgresql Stack ----"
FROM postgresql:alpine
LABEL description="API backend for testing and developed on Node+Express+Mariadb. "
RUN apk update --progress
RUN apk add -vv --progress mariadb mariadb-client
ENV DB_DATA_PATH="/var/lib/mysql"
ENV DB_ROOT_PASS="010495a"
ENV DB_USER="mariadb_user"
ENV DB_PASS="mariadb_user_password"
ENV MAX_ALLOWED_PACKET="200M"
ENV MYSQL_ROOT_PASSWORD=010495a
RUN ls /bin
ENV BASH_SOURCE=/usr/local/bin
COPY config/config-file.cnf /etc/mysql/my.cnf
RUN apk add openrc --no-cache
# #TODO: Add user to npm install
# RUN addgroup --gid "$NODE_GID" "$NODE_USER" \
# && adduser \
# --disabled-password \
# --gecos "" \
# --home /home/node \
# --ingroup "$NODE_USER" \
# --no-create-home \
# --uid "$NODE_UID" \
# "$NODE_USER"

# Overwrite the default entrypoint of mariadb:10.4
COPY init-docker.sh /usr/local/bin/
RUN chmod +x /usr/local/bin/init-docker.sh
ENTRYPOINT ["/usr/local/bin/init-docker.sh"]
# Initializing a fresh instance
COPY db1-myment-backup-2019-07-29.sql /init-docker-initdb.d/db1-myment-backup-2019-07-29.sql
WORKDIR /app
COPY . .
RUN chmod +x init-database.sh
# Change the permissions for security
COPY ./config/config-file.cnf /etc/mysql/conf.d
VOLUME ./data:/var/lib/mysql
EXPOSE 5000
CMD ["mysqld_safe"]

183 changes: 183 additions & 0 deletions config/config-file.cnf
Original file line number Diff line number Diff line change
@@ -0,0 +1,183 @@
# MariaDB database server configuration file.
#
# You can copy this file to one of:
# - "/etc/mysql/my.cnf" to set global options,
# - "~/.my.cnf" to set user-specific options.
#
# One can use all long options that the program supports.
# Run program with --help to get a list of available options and with
# --print-defaults to see which it would actually understand and use.
#
# For explanations see
# http://dev.mysql.com/doc/mysql/en/server-system-variables.html

# This will be passed to all mysql clients
# It has been reported that passwords should be enclosed with ticks/quotes
# escpecially if they contain "#" chars...
# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
[client]
port = 3306
socket = /var/run/mysqld/mysqld.sock

# Here is entries for some specific programs
# The following values assume you have at least 32M ram

# This was formally known as [safe_mysqld]. Both versions are currently parsed.
[mysqld_safe]
socket = /var/run/mysqld/mysqld.sock
nice = 0

[mysqld]
#
# * Basic Settings
#
#user = mysql
pid-file = /var/run/mysqld/mysqld.pid
socket = /var/run/mysqld/mysqld.sock
port = 3306
basedir = /usr
datadir = /var/lib/mysql
tmpdir = /tmp
lc_messages_dir = /usr/share/mysql
lc_messages = en_US
skip-external-locking
#
# Instead of skip-networking the default is now to listen only on
# localhost which is more compatible and is not less secure.
bind-address = 127.0.0.1
#
# * Fine Tuning
#
max_connections = 100
connect_timeout = 5
wait_timeout = 600
max_allowed_packet = 16M
thread_cache_size = 128
sort_buffer_size = 4M
bulk_insert_buffer_size = 16M
tmp_table_size = 32M
max_heap_table_size = 32M
#
# * MyISAM
#
# This replaces the startup script and checks MyISAM tables if needed
# the first time they are touched. On error, make copy and try a repair.
myisam_recover_options = BACKUP
key_buffer_size = 128M
#open-files-limit = 2000
table_open_cache = 400
myisam_sort_buffer_size = 512M
concurrent_insert = 2
read_buffer_size = 2M
read_rnd_buffer_size = 1M
#
# * Query Cache Configuration
#
# Cache only tiny result sets, so we can fit more in the query cache.
query_cache_limit = 128K
query_cache_size = 64M
# for more write intensive setups, set to DEMAND or OFF
#query_cache_type = DEMAND
#
# * Logging and Replication
#
# Both location gets rotated by the cronjob.
# Be aware that this log type is a performance killer.
# As of 5.1 you can enable the log at runtime!
#general_log_file = /var/log/mysql/mysql.log
#general_log = 1
#
# Error logging goes to syslog due to /etc/mysql/conf.d/mysqld_safe_syslog.cnf.
#
# we do want to know about network errors and such
#log_warnings = 2
#
# Enable the slow query log to see queries with especially long duration
#slow_query_log[={0|1}]
slow_query_log_file = /var/log/mysql/mariadb-slow.log
long_query_time = 10
#log_slow_rate_limit = 1000
#log_slow_verbosity = query_plan

#log-queries-not-using-indexes
#log_slow_admin_statements
#
# The following can be used as easy to replay backup logs or for replication.
# note: if you are setting up a replication slave, see README.Debian about
# other settings you may need to change.
#server-id = 1
#report_host = master1
#auto_increment_increment = 2
#auto_increment_offset = 1
#log_bin = /var/log/mysql/mariadb-bin
#log_bin_index = /var/log/mysql/mariadb-bin.index
# not fab for performance, but safer
#sync_binlog = 1
expire_logs_days = 10
max_binlog_size = 100M
# slaves
#relay_log = /var/log/mysql/relay-bin
#relay_log_index = /var/log/mysql/relay-bin.index
#relay_log_info_file = /var/log/mysql/relay-bin.info
#log_slave_updates
#read_only
#
# If applications support it, this stricter sql_mode prevents some
# mistakes like inserting invalid dates etc.
#sql_mode = NO_ENGINE_SUBSTITUTION,TRADITIONAL
#
# * InnoDB
#
# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
# Read the manual for more InnoDB related options. There are many!
default_storage_engine = InnoDB
# you can't just change log file size, requires special procedure
#innodb_log_file_size = 50M
innodb_buffer_pool_size = 256M
innodb_log_buffer_size = 8M
innodb_file_per_table = 1
innodb_open_files = 400
innodb_io_capacity = 400
innodb_flush_method = O_DIRECT
#
# * Security Features
#
# Read the manual, too, if you want chroot!
# chroot = /var/lib/mysql/
#
# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
#
# ssl-ca=/etc/mysql/cacert.pem
# ssl-cert=/etc/mysql/server-cert.pem
# ssl-key=/etc/mysql/server-key.pem

#
# * Galera-related settings
#
[galera]
# Mandatory settings
#wsrep_on=ON
#wsrep_provider=
#wsrep_cluster_address=
#binlog_format=row
#default_storage_engine=InnoDB
#innodb_autoinc_lock_mode=2
#
# Allow server to accept connections on all interfaces.
#
bind-address=0.0.0.0
#
# Optional setting
#wsrep_slave_threads=1
#innodb_flush_log_at_trx_commit=0

[mysqldump]
quick
quote-names
max_allowed_packet = 16M

[mysql]
#no-auto-rehash # faster start of mysql but no tab completion

[isamchk]
key_buffer = 16M
9 changes: 9 additions & 0 deletions config/database.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
const Sequelize = require('sequelize');

module.exports = new Sequelize('mysql', 'root', '010495a', {
host: 'localhost',
dialect: 'mariadb',
dialectOptions: {
timezone: 'Etc/GMT-3', // Verify THIS! IMPORTANT!
},
});
Loading

0 comments on commit 74e1ad5

Please sign in to comment.