Skip to content

Commit a6fcf72

Browse files
valhubervalhuber
committed
14.03.20: licensed webgenai docker, [87] sra fix for home.js
1 parent c4dcb6c commit a6fcf72

File tree

10 files changed

+155
-56
lines changed

10 files changed

+155
-56
lines changed

‎api_logic_server_cli/api_logic_server.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,10 @@
1212
Called from api_logic_server_cli.py, by instantiating the ProjectRun object.
1313
'''
1414

15-
__version__ = "14.03.18"
15+
__version__ = "14.03.20"
1616
recent_changes = \
1717
f'\n\nRecent Changes:\n' +\
18-
"\t03/19/2024 - 14.03.18: wg where are you \n"\
19-
"\t03/17/2024 - 14.03.17: sra fix for home.js \n"\
20-
"\t03/14/2024 - 14.03.16: fix config security uri for wg docker run of nw+ \n"\
21-
"\t03/12/2024 - 14.03.15: [86: bug fix for explicitly added wg rules (wip) \n"\
18+
"\t03/19/2024 - 14.03.20: licensed webgenai docker, [87] sra fix for home.js \n"\
2219
"\t02/26/2024 - 14.03.14: [85: reserved words], genai_demo fixes \n"\
2320
"\t02/16/2024 - 14.03.12: Docker w/ std container, mgr assistant for local WebG \n"\
2421
"\t02/13/2024 - 14.03.11: fixes [78: Keycloak, 79: boolean defaulting, 80: Send If missing attribute] \n"\

‎api_logic_server_cli/prototypes/manager/run_web_genai.sh

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
# Run WebGenAI locally from docker container
1+
# Run WebGenAI from docker container
22

3-
# Before running, update ./webgenai/webg_config/web_genai.txt
4-
# See: https://apilogicserver.github.io/Docs/WebGenAI-CLI/#configuration
5-
6-
# cd <manager>
3+
# cd genai-logic-main
74
# sh run_web_genai.sh
85

9-
docker run -it --rm --name webgenai -p 8282:80 --env-file ./webgenai/webg_config/web_genai.txt -v ./webgenai/webg_temp:/tmp -v ./webgenai/webg_config:/config -v ./webgenai/webg_projects:/opt/projects apilogicserver/web_genai
6+
docker compose -f webgenai/docker-compose-webg.yml up

‎api_logic_server_cli/prototypes/manager/webgenai/docker-compose-nw.yml

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎api_logic_server_cli/prototypes/manager/webgenai/run_web_genai.sh

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎docker/api_logic_server.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
# GA release -- DELETE BUILD DIRS FIRST
33

4-
# docker buildx build --push -f docker/api_logic_server.Dockerfile --tag apilogicserver/api_logic_server:14.03.14 -o type=image --platform=linux/arm64,linux/amd64 .
4+
# docker buildx build --push -f docker/api_logic_server.Dockerfile --tag apilogicserver/api_logic_server:14.03.20 -o type=image --platform=linux/arm64,linux/amd64 .
55
# docker buildx build --push -f docker/api_logic_server.Dockerfile --tag apilogicserver/api_logic_server:latest -o type=image --platform=linux/arm64,linux/amd64 .
66
# docker pull apilogicserver/api_logic_server:latest
77

‎docker/webgenie_docker/build_web_genie.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ if [ "$1" = "local" ]
7474
else
7575
# stand-alone test in terminal - cd $webgen_ai_docker-src, and...
7676
# docker buildx build --push -f webgenie.Dockerfile --tag apilogicserver/web_genai:1.0.0 -o type=image --platform=linux/arm64,linux/amd64 .
77-
docker buildx build --push -f webgenie.Dockerfile --tag apilogicserver/web_genai:14.03.14 -o type=image --platform=linux/arm64,linux/amd64 .
77+
docker buildx build --push -f webgenie.Dockerfile --tag apilogicserver/web_genai:14.03.20 -o type=image --platform=linux/arm64,linux/amd64 .
7878
docker buildx build --push -f webgenie.Dockerfile --tag apilogicserver/web_genai:latest -o type=image --platform=linux/arm64,linux/amd64 .
7979
fi
8080

‎docker/webgenie_docker/pre_license_web_genie/z_build_web_genie.sh

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
#!/bin/bash
2+
3+
set -e # exit on error
4+
5+
contains()
6+
# echo contains check $1 in $2
7+
case "$1" in
8+
(*"$2"*) true;;
9+
(*) false;;
10+
esac
11+
12+
ostype=$(uname -a)
13+
if contains "Ubuntu" $ostype; then
14+
ostype="ubuntu"
15+
fi
16+
# if contains "ubuntu" $ostype; then
17+
# echo $ostype contains ubuntu
18+
# fi
19+
20+
# Intende installed apilogicserver_dev:
21+
# cd ~/dev/ApiLogicServer/ApiLogicServer-dev/org_git/ApiLogicServer-src
22+
# cd ..
23+
# sh docker/webgenie_docker/build_web_genie.sh deploy
24+
25+
webgen_ai_docker='webgen_ai_docker'
26+
27+
SRC_DIR=$(pwd)
28+
29+
echo "\n\n Build Web/GenAI Docker, push to docker hub"
30+
31+
if [ $# -eq 0 ]
32+
then
33+
echo " "
34+
# echo "shell: $SHELL"
35+
echo " on $ostype (version 7.0.15)\n"
36+
echo " "
37+
echo " Note: creates a folder at pwd: $webgen_ai_docker"
38+
echo " "
39+
echo " > cd ~/dev/ApiLogicServer/ApiLogicServer-dev/org_git/ApiLogicServer-src"
40+
echo " > sh docker/webgenie_docker/build_web_genie.sh [local | deploy]"
41+
echo " "
42+
echo " local: build (not buildx), no publish to dockerhub"
43+
echo " "
44+
exit 0
45+
fi
46+
47+
echo " "
48+
# ls
49+
echo "pwd: $(pwd)\n"
50+
read -p "Verify pwd = ApiLogicServer-src, docker pull apilogicserver/api_logic_server complete> "
51+
echo " "
52+
53+
cd ..
54+
ORG_GIT_DIR=$(pwd)
55+
echo "pwd: $(pwd)"
56+
57+
echo " "
58+
echo "\nClean $webgen_ai_docker\n"
59+
set -x
60+
61+
rm -rf $webgen_ai_docker
62+
cp -r $SRC_DIR/docker/webgenie_docker/$webgen_ai_docker ./
63+
cd $webgen_ai_docker
64+
touch webgenai_env
65+
66+
# Build wg:
67+
git clone https://github.com/ApiLogicServer/sra --depth=1
68+
git clone https://github.com/ApiLogicServer/webgenai --depth=1
69+
70+
if [ "$1" = "local" ]
71+
then
72+
#docker build -f $SRC_DIR/docker/webgenie_docker/webgenie.Dockerfile -t apilogicserver/web_genie --no-cache --rm .
73+
docker build -f $SRC_DIR/docker/webgenie_docker/webgen_ai_docker/webgenie.Dockerfile -t apilogicserver/web_genai --no-cache --rm .
74+
else
75+
# stand-alone test in terminal - cd $webgen_ai_docker-src, and...
76+
# docker buildx build --push -f webgenie.Dockerfile --tag apilogicserver/web_genai:1.0.0 -o type=image --platform=linux/arm64,linux/amd64 .
77+
docker buildx build --push -f webgenie.Dockerfile --tag apilogicserver/web_genai:14.03.14 -o type=image --platform=linux/arm64,linux/amd64 .
78+
docker buildx build --push -f webgenie.Dockerfile --tag apilogicserver/web_genai:latest -o type=image --platform=linux/arm64,linux/amd64 .
79+
fi
80+
81+
set +x
82+
83+
# docker run -it --rm --name webgenie -p 8282:80 --env-file docker/webgenie_docker/webgen_ai_docker/webgenai.env apilogicserver/webgenie
84+
85+
# reminder - you can use web_genie_local, like this
86+
# docker run -it --rm --name webgenie -p 8282:80 --env-file ./../../webg-local/webg-config/web_genai.txt -v ./../../webg-local/webg-temp:/tmp -v ./../../webg-local/webg-projects:/opt/projects apilogicserver/web_genai
87+
88+
cd $SRC_DIR
89+
echo "\npwd: $(pwd)\n"
90+
echo "\nrun: docker run -it --rm --name webgenie -p 8282:80 --env-file ./../../webg-config/web_genai.txt -v ./../../webg-projects:/opt/projects apilogicserver/web_genai
91+
\n"
92+
exit 0
93+
94+
# Notes:
95+
echo For Dev, run WG with '
96+
docker run -it --rm --name webgenie -p 8282:80 --env-file /opt/webgenai_env \
97+
-v /opt/projects/:/opt/projects \
98+
-v /opt/webgenai:/opt/webgenai \
99+
-v ./api_logic_server_cli:/home/api_logic_server/api_logic_server_cli \
100+
apilogicserver/web_genai
101+
'

‎docker/webgenie_docker/pre_license_web_genie/z_webgenie.Dockerfile

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
2+
# see docker/webgenie_docker/build_web_genie.sh
3+
4+
FROM apilogicserver/api_logic_server
5+
6+
USER root
7+
8+
RUN apt-get update
9+
RUN apt-get install -y nginx jq sqlite3
10+
RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && \
11+
apt-get install -y nodejs && \
12+
apt-get clean && rm -rf /var/lib/apt/lists/*
13+
14+
RUN apt-get update && apt-get install wget -y \
15+
&& mkdir -p -m 755 /etc/apt/keyrings \
16+
&& wget -qO- https://cli.github.com/packages/githubcli-archive-keyring.gpg | tee /etc/apt/keyrings/githubcli-archive-keyring.gpg > /dev/null \
17+
&& chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg \
18+
&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
19+
&& apt update \
20+
&& apt install gh -y
21+
22+
RUN npm install -g @softwaretechnik/dbml-renderer
23+
COPY nginx/nginx.conf /etc/nginx/nginx.conf
24+
COPY nginx/wg.conf /etc/nginx/wg.conf
25+
RUN mkdir -p /etc/nginx/apis
26+
RUN chown -R api_logic_server /var/log/nginx /etc/nginx/apis
27+
RUN chown api_logic_server /var/lib/nginx
28+
RUN chmod 777 /run # TODO!! security issue?
29+
30+
RUN mkdir -p /opt/projects
31+
COPY webgenai/webgenai /opt/webgenai
32+
RUN cd /opt/webgenai/simple-spa && npm install
33+
RUN rm -fr /home/api_logic_server/api_logic_server_cli/create_from_model/safrs-react-admin-npm-build
34+
COPY sra/build /home/api_logic_server/api_logic_server_cli/create_from_model/safrs-react-admin-npm-build
35+
RUN chown -R api_logic_server /etc/nginx /opt /home/api_logic_server
36+
USER api_logic_server
37+
RUN pip install colorama astor
38+
EXPOSE 5656-7000
39+
40+
CMD ["bash", "-c", "/opt/webgenai/arun.sh"]

‎docker/webgenie_docker/webgen_ai_docker/webgenie.Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ RUN apt-get update && apt-get install wget -y \
2222
RUN npm install -g @softwaretechnik/dbml-renderer
2323
COPY nginx/nginx.conf /etc/nginx/nginx.conf
2424
COPY nginx/wg.conf /etc/nginx/wg.conf
25+
COPY license/license_checker.py /home/license/license_checker.py
26+
COPY license/startup.sh /home/license/startup.sh
27+
RUN chmod +x /home/license/startup.sh
2528
RUN mkdir -p /etc/nginx/apis
2629
RUN chown -R api_logic_server /var/log/nginx /etc/nginx/apis
2730
RUN chown api_logic_server /var/lib/nginx
@@ -35,6 +38,8 @@ COPY sra/build /home/api_logic_server/api_logic_server_cli/create_from_model/saf
3538
RUN chown -R api_logic_server /etc/nginx /opt /home/api_logic_server
3639
USER api_logic_server
3740
RUN pip install colorama astor
41+
3842
EXPOSE 5656-7000
3943

40-
CMD ["bash", "-c", "/opt/webgenai/arun.sh"]
44+
# CMD ["bash", "-c", "/opt/webgenai/arun.sh"]
45+
CMD ["bash", "-c", "/home/license/startup.sh"]

‎docker/webgenie_docker/webgen_ai_docker/webgenie_local_license.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN chmod 777 /run # TODO!! security issue?
2626

2727
RUN mkdir -p /opt/projects
2828
COPY webgenai/webgenai /opt/webgenai
29-
COPY arun.sh /opt/webgenai/arun.sh
29+
# COPY arun.sh /opt/webgenai/arun.sh
3030
RUN cd /opt/webgenai/simple-spa && npm install
3131
RUN rm -fr /home/api_logic_server/api_logic_server_cli/create_from_model/safrs-react-admin-npm-build
3232
COPY sra/build /home/api_logic_server/api_logic_server_cli/create_from_model/safrs-react-admin-npm-build

0 commit comments

Comments
 (0)