Skip to content

Commit

Permalink
b
Browse files Browse the repository at this point in the history
  • Loading branch information
polterguy committed Dec 18, 2023
1 parent 249c1bc commit 06c29ae
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 27 deletions.
1 change: 0 additions & 1 deletion .sonarcloud.properties

This file was deleted.

10 changes: 6 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
# Contributon to Magic
# Contributon to AINIRO.IO Magic Cloud

In order to contribute to Magic, we need your employer's consent that you are legally allowed to contribute to open source projects.
This implies at the minimum having your closest upwards _"C level executive"_ send you an email confirming that it's OK for
you to contribute to Magic, allowing us to sub-license your work any ways we see fit, for then to forward that email to thomas@ainiro.io.
In order to contribute to AINIRO.IO Magic Cloud, we need your employer's consent that you are legally allowed to
contribute to open source projects.
This implies at the minimum having your closest upwards _"C level executive"_ send you an email confirming that
it's OK for you to contribute to Magic, allowing us to sub-license your work any ways we see fit, for then to
forward that email to thomas@ainiro.io.

Hence, if you want to contribute to Magic, you will need to send two emails to thomas@ainiro.io as explained further up. Otherwise
we cannot for legal reasons accept your contribution.
26 changes: 8 additions & 18 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,17 @@ version: "3.3"

services:

db:
image: mariadb:10.5.8
container_name: magic_mysql
restart: always
environment:
MYSQL_ROOT_PASSWORD: ThisIsNotAGoodPassword
volumes:
- database_mysql:/var/lib/mysql

backend:
image: aistamagic/magic-backend:latest
container_name: magic_backend
depends_on:
- db
restart: always
ports:
- "4444:4444"
volumes:
- magic_files_data_mysql:/magic/files/data
- magic_files_config_mysql:/magic/files/config
- magic_files_modules_mysql:/magic/files/modules
- magic_files_etc:/magic/files/etc
- magic_files_data:/magic/files/data
- magic_files_config:/magic/files/config
- magic_files_modules:/magic/files/modules

frontend:
image: aistamagic/magic-frontend:latest
Expand All @@ -37,7 +27,7 @@ services:
- "5555:80"

volumes:
database_mysql:
magic_files_data_mysql:
magic_files_config_mysql:
magic_files_modules_mysql:
magic_files_etc:
magic_files_data:
magic_files_config:
magic_files_modules:
2 changes: 1 addition & 1 deletion frontend/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Aista Magic Cloud frontend
# AINIRO.IO Magic Cloud frontend

This is Magic's frontend dashboard, allowing you to manage your backend cloudlet.

Expand Down
3 changes: 1 addition & 2 deletions frontend/ngsw-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
"installMode": "prefetch",
"resources": {
"files": [
"/favicon.ico",
"/index.html",
"/manifest.webmanifest",
"/assets/site.webmanifest",
"/*.css",
"/*.js"
]
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

<link
rel="manifest"
href="/assets/manifest.webmanifest">
href="/assets/site.webmanifest">

<meta
name="theme-color"
Expand Down

0 comments on commit 06c29ae

Please sign in to comment.