diff --git a/README.md b/README.md index f572d0e..1f5b472 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ cp /srv/env/test_aether/.env /srv/env/test_aether/.env.bak cp /srv/env/test_aether/.env.default /srv/env/test_aether/.env ``` **/.env [very basic example]** +The AE_CFG_ID and AE_APP_CFG_ID can be something generic (dev, test, prod a, prod b) when using Docker Compose. ```cnf # One Sky IT's Aether Framework and System @@ -48,7 +49,7 @@ AE_APP_CFG_ID=0 KEY="The Value" ``` -#### Part 4 - Still figuruing things out... +#### Part 4 - Still figuring things out... Update /etc/hosts with something like this. ```cnf 127.0.0.1 dev-api.oneskyit.com dev-app.oneskyit.com @@ -67,6 +68,43 @@ docker restart ae_app_dev docker restart ae_mariadb_dev ``` +## Clone Svelte App(s) + +### One Sky IT NPM library +git clone https://scott_idem@bitbucket.org/oneskyit/one-sky-it-npm-library.git /srv/env/aether_npm_library + +### Actual Svelte apps (note the branches) +Clone: +* git clone https://scott_idem@bitbucket.org/oneskyit/one-sky-it-app-svelte.git /srv/env/aether_xxx_yyy_svelte +* git clone https://scott_idem@bitbucket.org/oneskyit/one-sky-it-app-svelte.git ~/OSIT_dev/aether_xxx_yyy_svelte +Module groups: +* aether_app_core_svelte +* aether_app_mods_svelte +* aether_app_mod_events_svelte +Note: +Will need to change branches. +```bash +git branch --all +git switch ae_core_dev +git pull origin ae_core_dev + +git switch ae_mods_dev +git pull origin ae_mods_dev + +git switch ae_mod_events_dev +git pull origin ae_mod_events_dev + +git branch --all +``` +Also... don't forget to npm update before you npm run build or dev. + +### Native Electron app +git clone https://scott_idem@bitbucket.org/oneskyit/one-sky-it-app-native.git /srv/env/aether_app_native + + + +sdfasdfasd git clone https://scott_idem@bitbucket.org/oneskyit/one-sky-it-container-environment.git /srv/env/test_aether + --- diff --git a/docker-compose.yml b/docker-compose.yml index eccf596..f66a147 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -178,16 +178,16 @@ services: # env_file: # - ./.env # - filename.env - ports: - - "3307:3306" + # ports: + # - "3307:3306" volumes: - ./srv/mariadb:/var/lib/mysql # - ./conf/mariadb/password_reset.sql:/docker-entrypoint-initdb.d/init.sql:ro # - ./conf/mariadb/password_reset.sql:/password_reset.sql:z # - ./srv/mariadb_ln:/var/lib/mysql # - ./conf/mariadb/my.cnf:/etc/my.cnf - # environment: - # - MARIADB_ROOT_PASSWORD=$$1sky.Adapting.7e2 + environment: + - MARIADB_ROOT_PASSWORD=$$1sky.Adapting.7e2 # - MARIADB_ROOT_PASSWORD=CentauriStar123 # - MARIADB_DATABASE: 'my_env_db' # - MYSQL_ROOT_PASSWORD=$$1sky.Adapting.7e2