Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tag change as of latest release #76

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions docker-compose/docker-compose-arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,17 @@ services:
- formsflow

forms-flow-web:
image: formsflow/forms-flow-web:v7.0.0-alpha
image: formsflow/forms-flow-web:6.0.2
platform: linux/arm64/v8
links:
- forms-flow-webapi
entrypoint: /bin/sh -c "/usr/share/nginx/html/config/env.sh && nginx -g 'daemon off;'"
environment:
# - MF_FORMSFLOW_WEB_URL=${MF_FORMSFLOW_WEB_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-web@v7.0.0-alpha/forms-flow-web.gz.js}
# - MF_FORMSFLOW_NAV_URL=${MF_FORMSFLOW_NAV_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-nav@v7.0.0-alpha/forms-flow-nav.gz.js}
# - MF_FORMSFLOW_SERVICE_URL=${MF_FORMSFLOW_SERVICE_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-service@v7.0.0-alpha/forms-flow-service.gz.js}
# - MF_FORMSFLOW_ADMIN_URL=${MF_FORMSFLOW_ADMIN_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-admin@v7.0.0-alpha/forms-flow-admin.gz.js}
# - MF_FORMSFLOW_THEME_URL=${MF_FORMSFLOW_THEME_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-theme@v7.0.0-alpha/forms-flow-theme.gz.js}
# - MF_FORMSFLOW_WEB_URL=${MF_FORMSFLOW_WEB_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-web@v6.0.2/forms-flow-web.gz.js}
# - MF_FORMSFLOW_NAV_URL=${MF_FORMSFLOW_NAV_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-nav@v6.0.2/forms-flow-nav.gz.js}
# - MF_FORMSFLOW_SERVICE_URL=${MF_FORMSFLOW_SERVICE_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-service@v6.0.2/forms-flow-service.gz.js}
# - MF_FORMSFLOW_ADMIN_URL=${MF_FORMSFLOW_ADMIN_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-admin@v6.0.2/forms-flow-admin.gz.js}
# - MF_FORMSFLOW_THEME_URL=${MF_FORMSFLOW_THEME_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-theme@v6.0.2/forms-flow-theme.gz.js}
- NODE_ENV=${NODE_ENV:-production}
- REACT_APP_API_SERVER_URL=${FORMIO_DEFAULT_PROJECT_URL}
- REACT_APP_API_PROJECT_URL=${FORMIO_DEFAULT_PROJECT_URL}
Expand Down Expand Up @@ -108,7 +108,7 @@ services:
- formsflow

forms-flow-forms:
image: formsflow/forms-flow-forms:v7.0.0-alpha
image: formsflow/forms-flow-forms:v6.0.0
restart: always
environment:
DEBUG: formio:*
Expand Down Expand Up @@ -139,7 +139,7 @@ services:
- formsflow

forms-flow-bpm:
image: formsflow/forms-flow-bpm:v7.0.0-alpha-arm64
image: formsflow/forms-flow-bpm:v6.0.2-arm64
restart: always
environment:
- KEYCLOAK_URL=${KEYCLOAK_URL}
Expand Down Expand Up @@ -203,7 +203,7 @@ services:
- formsflow

forms-flow-webapi:
image: formsflow/forms-flow-webapi:v7.0.0-alpha
image: formsflow/forms-flow-webapi:v6.0.2
restart: always
links:
- forms-flow-webapi-db
Expand Down Expand Up @@ -252,7 +252,7 @@ services:
- formsflow

forms-flow-documents:
image: formsflow/forms-flow-documents-api:v7.0.0-alpha-arm64
image: formsflow/forms-flow-documents-api:v6.0.2-arm64
restart: always
volumes:
- ./:/app:rw
Expand Down
10 changes: 5 additions & 5 deletions docker-compose/docker-compose-ee.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ services:
- formsflow

forms-flow-web:
image: formsflow/forms-flow-web-ee:v7.0.0-alpha
image: formsflow/forms-flow-web-ee:v6.0.2
links:
- forms-flow-webapi
entrypoint: /bin/sh -c "/usr/share/nginx/html/config/env.sh && nginx -g 'daemon off;'"
Expand Down Expand Up @@ -133,7 +133,7 @@ services:
- formsflow

forms-flow-bpm:
image: formsflow/forms-flow-bpm-ee:v7.0.0-alpha
image: formsflow/forms-flow-bpm-ee:v6.0.2
restart: always
environment:
- KEYCLOAK_URL=${KEYCLOAK_URL}
Expand Down Expand Up @@ -197,7 +197,7 @@ services:
- formsflow

forms-flow-webapi:
image: formsflow/forms-flow-webapi-ee:v7.0.0-alpha
image: formsflow/forms-flow-webapi-ee:v6.0.2
restart: always
links:
- forms-flow-webapi-db
Expand Down Expand Up @@ -246,7 +246,7 @@ services:
- formsflow

forms-flow-documents-api:
image: formsflow/forms-flow-documents-api-ee:v7.0.0-alpha
image: formsflow/forms-flow-documents-api-ee:v6.0.2
restart: always
links:
- forms-flow-forms
Expand Down Expand Up @@ -297,7 +297,7 @@ services:
- '5430:5432'

forms-flow-data-analysis-api:
image: formsflow/forms-flow-data-analysis-api:v7.0.0-alpha
image: formsflow/forms-flow-data-analysis-api:v6.0.2
restart: always
links:
- forms-flow-data-analysis-db
Expand Down
12 changes: 6 additions & 6 deletions docker-compose/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ services:
- formsflow

forms-flow-web:
image: formsflow/forms-flow-web:v7.0.0-alpha
image: formsflow/forms-flow-web:v6.0.2
links:
- forms-flow-webapi
entrypoint: /bin/sh -c "/usr/share/nginx/html/config/env.sh && nginx -g 'daemon off;'"
Expand Down Expand Up @@ -103,7 +103,7 @@ services:
- formsflow

forms-flow-forms:
image: formsflow/forms-flow-forms:v7.0.0-alpha
image: formsflow/forms-flow-forms:v6.0.0
restart: always
environment:
DEBUG: formio:*
Expand Down Expand Up @@ -134,7 +134,7 @@ services:
- formsflow

forms-flow-bpm:
image: formsflow/forms-flow-bpm:v7.0.0-alpha
image: formsflow/forms-flow-bpm:v6.0.2
restart: always
environment:
- KEYCLOAK_URL=${KEYCLOAK_URL}
Expand Down Expand Up @@ -198,7 +198,7 @@ services:
- formsflow

forms-flow-webapi:
image: formsflow/forms-flow-webapi:v7.0.0-alpha
image: formsflow/forms-flow-webapi:v6.0.2
restart: always
links:
- forms-flow-webapi-db
Expand Down Expand Up @@ -247,7 +247,7 @@ services:
- formsflow

forms-flow-documents-api:
image: formsflow/forms-flow-documents-api:v7.0.0-alpha
image: formsflow/forms-flow-documents-api:v6.0.2
restart: always
links:
- forms-flow-forms
Expand Down Expand Up @@ -298,7 +298,7 @@ services:
- '5430:5432'

forms-flow-data-analysis-api:
image: formsflow/forms-flow-data-analysis-api:v7.0.0-alpha
image: formsflow/forms-flow-data-analysis-api:v6.0.2
restart: always
links:
- forms-flow-data-analysis-db
Expand Down
10 changes: 5 additions & 5 deletions docker-compose/sample.env
Original file line number Diff line number Diff line change
Expand Up @@ -228,13 +228,13 @@ CUSTOM_SUBMISSION_URL=http://{your-ip-address}:{port}

#The MF Variables below are used to get MicroFrontend Components Created

#MF_FORMSFLOW_WEB_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-web@v7.0.0-alpha/forms-flow-web.gz.js
#MF_FORMSFLOW_WEB_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-web@6.0.2/forms-flow-web.gz.js

## Refer Github Repo https://github.com/AOT-Technologies/forms-flow-ai-micro-front-ends and update to your own custom implementation for the Components here
#MF_FORMSFLOW_NAV_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-nav@v7.0.0-alpha/forms-flow-nav.gz.js
#MF_FORMSFLOW_SERVICE_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-service@v7.0.0-alpha/forms-flow-service.gz.js
#MF_FORMSFLOW_COMPONENTS_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-components@v7.0.0-alpha/forms-flow-components.gz.js
#MF_FORMSFLOW_ADMIN_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-admin@v7.0.0-alpha/forms-flow-admin.gz.js
#MF_FORMSFLOW_NAV_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-nav@6.0.2/forms-flow-nav.gz.js
#MF_FORMSFLOW_SERVICE_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-service@6.0.2/forms-flow-service.gz.js
#MF_FORMSFLOW_COMPONENTS_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-components@6.0.2/forms-flow-components.gz.js
#MF_FORMSFLOW_ADMIN_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-admin@6.0.2/forms-flow-admin.gz.js
#++++++++++++++++--- formsflow.ai Web Microfrontend components ENV Variables - STOP ---+++++++++++++++++++++++++#


Expand Down
6 changes: 4 additions & 2 deletions scripts/install.bash
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,11 @@ isUp() {

# Function to find the IPv4 address
find_my_ip() {
ipadd=$(hostname -I | awk '{print $1}')
if [ "$(uname)" == "Darwin" ]; then
# ipadd=$(hostname -I | awk '{print $1}')
if [ "$(uname)" = "Darwin" ]; then
ipadd=$(ipconfig getifaddr en0)
elif [ "$(uname)" = "Linux" ]; then
ipadd=$(hostname -I | awk '{print $1}')
fi
ip_add=$ipadd
read -p "Confirm that your IPv4 address is $ip_add? [y/n]: " choice
Expand Down