Update configuration for Gitlab transition
* Add CI config * Update README * Remove Changelog (moving to CD) * Split docker to dev and testmerge-requests/204/head
parent
6aa5b4fe77
commit
bae488a7ea
|
@ -0,0 +1,39 @@
|
|||
image: registry.gitlab.com/librespacefoundation/satnogs/satnogs-db:latest
|
||||
|
||||
stages:
|
||||
- test
|
||||
- deploy
|
||||
|
||||
test:
|
||||
stage: test
|
||||
script:
|
||||
- pip install --no-cache-dir --require-hashes --no-deps -r /app/requirements/dev.txt
|
||||
- cp env-dist .env
|
||||
- flake8 .
|
||||
- pytest
|
||||
- eslint 'db/static/js/*.js'
|
||||
- stylelint 'db/static/css/*.css'
|
||||
|
||||
stage:
|
||||
stage: deploy
|
||||
environment: stage
|
||||
only:
|
||||
- dev
|
||||
script:
|
||||
- mkdir -p ~/.ssh
|
||||
- echo "$SSH_PRIVATE_KEY" >> ~/.ssh/id_rsa
|
||||
- chmod -R u=rwX,o=,g= ~/.ssh/
|
||||
- echo "$SSH_SERVER_HOSTKEY" > ~/.ssh/known_hosts
|
||||
- git push -u ssh://$SERVER_USER@$SERVER_HOST$SERVER_PATH dev
|
||||
|
||||
production:
|
||||
stage: deploy
|
||||
environment: production
|
||||
only:
|
||||
- master
|
||||
script:
|
||||
- mkdir -p ~/.ssh
|
||||
- echo "$SSH_PRIVATE_KEY" >> ~/.ssh/id_rsa
|
||||
- chmod -R u=rwX,o=,g= ~/.ssh/
|
||||
- echo "$SSH_SERVER_HOSTKEY" > ~/.ssh/known_hosts
|
||||
- git push -u ssh://$SERVER_USER@$SERVER_HOST$SERVER_PATH master
|
12
.pyup.yml
12
.pyup.yml
|
@ -1,12 +0,0 @@
|
|||
# Full list of options at https://pyup.io/docs/configuration/
|
||||
update: all
|
||||
pin: True
|
||||
branch: dev
|
||||
schedule: "every week on friday"
|
||||
search: False
|
||||
requirements:
|
||||
- requirements/production.txt
|
||||
assignees: comzeradd
|
||||
branch_prefix: pyup-
|
||||
pr_prefix: "[update]"
|
||||
close_prs: True
|
16
.travis.yml
16
.travis.yml
|
@ -1,16 +0,0 @@
|
|||
language: python
|
||||
dist: trusty
|
||||
notifications:
|
||||
email: false
|
||||
python:
|
||||
- "2.7"
|
||||
install:
|
||||
- pip install -r requirements/dev.txt
|
||||
- npm install -g eslint stylelint
|
||||
script:
|
||||
- flake8 .
|
||||
- pytest
|
||||
- eslint 'db/static/js/*.js'
|
||||
- stylelint 'db/static/css/*.css'
|
||||
after_success:
|
||||
- coveralls
|
74
Changelog.md
74
Changelog.md
|
@ -1,74 +0,0 @@
|
|||
## 2017.05-1
|
||||
* Counts of payloads on satellite page
|
||||
* Recamp homepage UI
|
||||
* Fetch and keep on TLE per Satellite
|
||||
* Add gulp support
|
||||
* Upgrade to Django 1.11
|
||||
* Add task to export satellite frames on csv
|
||||
* Add Satellite status
|
||||
* Add decoder for UniSAT-6
|
||||
* Add description field on Satellites
|
||||
|
||||
## 0.9
|
||||
* Add redis support for cache
|
||||
* Add dnd-helper for Do-Not-Track
|
||||
* Add CSP support
|
||||
* Use hashes for pip
|
||||
* First iteratio of SiDS support
|
||||
* Add API Key Tokens
|
||||
* Split fetch and decode telemetry data jobs
|
||||
|
||||
## 0.8
|
||||
|
||||
* Add telemetry decoding functionlity
|
||||
* Add telemetry UI per satellite
|
||||
* Add travis support
|
||||
* Switch to bower for static dependencies
|
||||
* Increase frq precision
|
||||
* Add stats visualizations
|
||||
|
||||
## 0.7
|
||||
|
||||
* Provide initiliaze command for developers
|
||||
* Enhance Satellite view with image
|
||||
* Fix case sensitivity on filtering
|
||||
* Add static files compression
|
||||
* Show suggestion to frontend for admins
|
||||
* Email admins on new suggestion
|
||||
|
||||
## 0.6
|
||||
|
||||
* Redesign homepage UI
|
||||
* Satellite additional names and image
|
||||
* Move Modes to model
|
||||
|
||||
## 0.5
|
||||
|
||||
* Rename Transponders to Transmitters
|
||||
|
||||
## 0.4
|
||||
|
||||
* Hide suggestions counter when None
|
||||
* Command to fetch satellites names
|
||||
* Opbeat logging
|
||||
* Notify user when their suggestion is approved
|
||||
* API filtering
|
||||
* Custom 404/500 pages
|
||||
|
||||
## 0.3
|
||||
|
||||
* Show active link on top menu
|
||||
* Beautify freqs as MHz
|
||||
* Add Suggestions stats
|
||||
|
||||
## 0.2
|
||||
|
||||
* Simplify suggestions UI
|
||||
* About page
|
||||
* FAQ
|
||||
* Opbeat
|
||||
* Suggestion approval admin action
|
||||
|
||||
## 0.1
|
||||
|
||||
* Initial release
|
13
README.md
13
README.md
|
@ -2,24 +2,23 @@
|
|||
|
||||
SatNOGS DB is a transmitter suggestions and crowd-sourcing app.
|
||||
|
||||
## Install and Contribute
|
||||
## Contribute
|
||||
|
||||
See the [documentation](http://docs.satnogs.org/en/stable/db/).
|
||||
Check out the [documentation](https://docs.satnogs.org/en/stable/satnogs-db/docs/) on how to setup a local development instance.
|
||||
|
||||
The main repository lives on [Gitlab](https://gitlab.com/librespacefoundation/satnogs/satnogs-db).
|
||||
|
||||
## Join
|
||||
|
||||
[![irc](https://img.shields.io/badge/Matrix-%23satnogs:matrix.org-blue.svg)](https://riot.im/app/#/room/#satnogs:matrix.org)
|
||||
[![irc](https://img.shields.io/badge/IRC-%23satnogs%20on%20freenode-blue.svg)](https://webchat.freenode.net/?channels=satnogs)
|
||||
[![irc](https://img.shields.io/badge/forum-discourse-blue.svg)](https://community.satnogs.org/)
|
||||
[![irc](https://img.shields.io/badge/forum-discourse-blue.svg)](https://community.libre.space/c/satnogs)
|
||||
|
||||
## Current Development
|
||||
|
||||
[![kanban](https://img.shields.io/badge/kanban-board-lightgray.svg)](https://gitlab.com/librespacefoundation/satnogs/satnogs-db/boards/345706)
|
||||
[![travis](https://img.shields.io/travis/satnogs/satnogs-db/dev.svg?label=tests)](http://travis-ci.org/satnogs/satnogs-db/)
|
||||
[![coveralls](https://img.shields.io/coveralls/satnogs/satnogs-db/dev.svg)](https://coveralls.io/github/satnogs/satnogs-db)
|
||||
[![updates](https://pyup.io/repos/github/satnogs/satnogs-db/shield.svg)](https://pyup.io/repos/github/satnogs/satnogs-db/)
|
||||
[![Python 3](https://pyup.io/repos/github/satnogs/satnogs-db/python-3-shield.svg)](https://pyup.io/repos/github/satnogs/satnogs-db/)
|
||||
[![build](https://gitlab.com/librespacefoundation/satnogs/satnogs-db/badges/dev/build.svg)](https://gitlab.com/librespacefoundation/satnogs/satnogs-db/commits/dev)
|
||||
[![coverage](https://gitlab.com/librespacefoundation/satnogs/satnogs-db/badges/dev/coverage.svg)](https://gitlab.com/librespacefoundation/satnogs/satnogs-db/commits/dev)
|
||||
|
||||
## License
|
||||
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
<li class="{% active request 'about' %}"><a href="{% url 'about' %}">About</a></li>
|
||||
<li class="{% active request 'stats' %}"><a href="{% url 'stats' %}">Statistics</a></li>
|
||||
<li class="{% active request 'faq' %}"><a href="{% url 'faq' %}">FAQ</a></li>
|
||||
<li><a href="https://community.satnogs.org/" target="_blank">Community</a></li>
|
||||
<li><a href="https://community.libre.space/c/satnogs/" target="_blank">Community</a></li>
|
||||
</ul>
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
{% if request.user.is_authenticated %}
|
||||
|
|
|
@ -78,9 +78,9 @@
|
|||
transmitter information for. We need your help to expand our database!
|
||||
</li>
|
||||
<li>
|
||||
Go to our <a href="https://community.libre.space/tags/db" target="_blank">Community Forum</a>
|
||||
and open a new thread requesting a satellite addition, with additional info
|
||||
(links and citations) about it.
|
||||
Go to our <a href="https://community.libre.space/tags/db" target="_blank">Community Forum</a>
|
||||
and open a new thread requesting a satellite addition, with additional info
|
||||
(links and citations) about it.
|
||||
</li>
|
||||
<li>
|
||||
A DB reviewer will answer promptly and add the satellite to the DB so you can suggest
|
||||
|
|
|
@ -1,38 +1,44 @@
|
|||
db:
|
||||
image: mariadb:5.5
|
||||
environment:
|
||||
- MYSQL_DATABASE=satnogsdb
|
||||
- MYSQL_USER=satnogsdb
|
||||
- MYSQL_PASSWORD=satnogsdb
|
||||
- MYSQL_ROOT_PASSWORD=toor
|
||||
redis:
|
||||
image: redis:3.2.8
|
||||
celery:
|
||||
build: .
|
||||
volumes:
|
||||
- .:/app
|
||||
links:
|
||||
- db
|
||||
- redis
|
||||
environment:
|
||||
- ENVIRONMENT=stage
|
||||
- DEBUG=True
|
||||
- DATABASE_URL=mysql://satnogsdb:satnogsdb@db/satnogsdb
|
||||
command:
|
||||
./docker/run-celery.sh
|
||||
web:
|
||||
build: .
|
||||
ports:
|
||||
- "8000:8000"
|
||||
volumes:
|
||||
- .:/app
|
||||
links:
|
||||
- db
|
||||
- redis
|
||||
- celery
|
||||
environment:
|
||||
- ENVIRONMENT=stage
|
||||
- DEBUG=True
|
||||
- DATABASE_URL=mysql://satnogsdb:satnogsdb@db/satnogsdb
|
||||
command:
|
||||
./docker/run-web.sh
|
||||
version: '3'
|
||||
services:
|
||||
db:
|
||||
image: mariadb:5.5
|
||||
environment:
|
||||
- MYSQL_DATABASE=satnogsdb
|
||||
- MYSQL_USER=satnogsdb
|
||||
- MYSQL_PASSWORD=satnogsdb
|
||||
- MYSQL_ROOT_PASSWORD=toor
|
||||
redis:
|
||||
image: redis:3.2.8
|
||||
celery:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: docker/dev
|
||||
volumes:
|
||||
- .:/app
|
||||
links:
|
||||
- db
|
||||
- redis
|
||||
environment:
|
||||
- ENVIRONMENT=stage
|
||||
- DEBUG=True
|
||||
- DATABASE_URL=mysql://satnogsdb:satnogsdb@db/satnogsdb
|
||||
command:
|
||||
./bin/run-celery.sh
|
||||
web:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: docker/dev
|
||||
ports:
|
||||
- "8000:8000"
|
||||
volumes:
|
||||
- .:/app
|
||||
links:
|
||||
- db
|
||||
- redis
|
||||
- celery
|
||||
environment:
|
||||
- ENVIRONMENT=stage
|
||||
- DEBUG=True
|
||||
- DATABASE_URL=mysql://satnogsdb:satnogsdb@db/satnogsdb
|
||||
command:
|
||||
./bin/run-web.sh
|
||||
|
|
|
@ -2,17 +2,13 @@ FROM centos:7
|
|||
RUN yum makecache
|
||||
RUN yum -y install epel-release
|
||||
RUN yum -y install python python-pip python-devel git gcc libjpeg-turbo-devel \
|
||||
libxml2-devel libxslt-devel mysql-devel mysql npm
|
||||
libxml2-devel libxslt-devel mysql-devel mysql
|
||||
RUN yum -y clean all
|
||||
RUN npm install -g bower gulp-cli
|
||||
RUN pip install --upgrade pip
|
||||
|
||||
COPY ./requirements/ /tmp/requirements/
|
||||
RUN pip install --no-cache-dir --require-hashes --no-deps -r /tmp/requirements/dev.txt
|
||||
|
||||
WORKDIR /app
|
||||
COPY . /app
|
||||
|
||||
EXPOSE 80
|
||||
|
||||
CMD ["./docker/run-docker.sh"]
|
||||
CMD ["./bin/run-docker.sh"]
|
|
@ -0,0 +1,9 @@
|
|||
FROM fedora:latest
|
||||
RUN dnf -y install python python-pip python-devel git gcc libjpeg-turbo-devel findutils \
|
||||
libxml2-devel libxslt-devel mysql-devel mysql npm redhat-rpm-config
|
||||
RUN dnf -y clean all
|
||||
|
||||
RUN npm install -g eslint stylelint
|
||||
|
||||
WORKDIR /app
|
||||
COPY . /app
|
|
@ -15,7 +15,7 @@ Docker Installation
|
|||
|
||||
Set your environmental variables::
|
||||
|
||||
$ cp .env-dist .env
|
||||
$ cp env-dist .env
|
||||
|
||||
Start database containers::
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@ Requirements: You will need python, python-virtualenvwrapper, pip and git
|
|||
|
||||
Set your environmental variables::
|
||||
|
||||
$ cp .env-dist .env
|
||||
$ cp env-dist .env
|
||||
|
||||
Activate your python virtual environment::
|
||||
|
||||
|
|
Loading…
Reference in New Issue