diff --git a/workspaces/sqlite-workspace/Dockerfile b/workspaces/sqlite-workspace/Dockerfile index 8e01676..29e014e 100644 --- a/workspaces/sqlite-workspace/Dockerfile +++ b/workspaces/sqlite-workspace/Dockerfile @@ -1,7 +1,7 @@ ARG docker_registry=docker.io/alnoda ARG image_tag=3.0 -FROM ${docker_registry}/theia-workspace:${image_tag} +FROM ${docker_registry}/ide-workspace:${image_tag} USER root COPY supervisord-sqlite.conf /etc/supervisord/ @@ -9,19 +9,19 @@ COPY supervisord-sqlite.conf /etc/supervisord/ # Customize mkdocs COPY ./mkdocs/mkdocs.yml /home/docs/mkdocs.yml COPY ./mkdocs/README.md /home/docs/docs/README.md -COPY ./mkdocs/img/* /home/docs/docs/assets/ +COPY ./mkdocs/img/* /home/docs/docs/assets/home/ COPY ./mkdocs/helpers.py /home/docs/macros COPY ./mkdocs/sqlite-circle.svg /home/docs/docs/assets/ COPY ./mkdocs/sqlite-circle-white.svg /home/docs/docs/assets/ COPY ./mkdocs/extra.css /home/docs/docs/stylesheets/ COPY ./mkdocs/about.md /home/docs/docs/about.md - -# apt-get install -y sqlite3 \ +COPY ./mkdocs/admin.md /home/docs/docs/pages/admin.md +COPY ./mkdocs/admin /home/docs/docs/pages/admin RUN echo "------------------------------------------------------ sqlite3" \ - && cd /tmp && wget https://sqlite.org/2021/sqlite-autoconf-3350400.tar.gz \ - && tar zxvf /tmp/sqlite-autoconf-3350400.tar.gz \ - && cd /tmp/sqlite-autoconf-3350400 \ + && cd /opt && wget https://sqlite.org/2021/sqlite-autoconf-3350400.tar.gz \ + && tar zxvf /opt/sqlite-autoconf-3350400.tar.gz \ + && cd /opt/sqlite-autoconf-3350400 \ && ./configure --prefix=/usr \ --disable-static \ --enable-fts5 \ @@ -34,10 +34,9 @@ RUN echo "------------------------------------------------------ sqlite3" \ -DSQLITE_ENABLE_FTS3_TOKENIZER=1" \ && make \ && make install \ - && rm /tmp/sqlite-autoconf-3350400.tar.gz \ - && rm -rf /tmp/sqlite-autoconf-3350400 \ + && rm /opt/sqlite-autoconf-3350400.tar.gz \ && echo "------------------------------------------------------ cli" \ - && pip install litecli==1.7.0 \ + && pip install litecli==1.9.0 \ && echo "------------------------------------------------------ rclone" \ && curl https://rclone.org/install.sh | bash \ && echo "------------------------------------------------------ pspg" \ diff --git a/workspaces/sqlite-workspace/mkdocs/README.md b/workspaces/sqlite-workspace/mkdocs/README.md index 8207db3..5dc4c8a 100644 --- a/workspaces/sqlite-workspace/mkdocs/README.md +++ b/workspaces/sqlite-workspace/mkdocs/README.md @@ -117,6 +117,7 @@ "image": "assets/home/Ungit.jpg", "description": "Manage Git repositories and work flow using beautiful UI" } + ] %} diff --git a/workspaces/sqlite-workspace/mkdocs/about.md b/workspaces/sqlite-workspace/mkdocs/about.md index e69de29..ad93cb7 100644 --- a/workspaces/sqlite-workspace/mkdocs/about.md +++ b/workspaces/sqlite-workspace/mkdocs/about.md @@ -0,0 +1 @@ +Containerized workspace that helps to develop SQLite databases. \ No newline at end of file diff --git a/workspaces/sqlite-workspace/mkdocs/admin.md b/workspaces/sqlite-workspace/mkdocs/admin.md new file mode 100644 index 0000000..c69d7e2 --- /dev/null +++ b/workspaces/sqlite-workspace/mkdocs/admin.md @@ -0,0 +1,110 @@ + + + +{% + set tools = [ + { + "env": "CRONICLE_URL", + "name": "Cronicle", + "image": "Cronicle.jpg", + "description": "Schedule jobs, manage schedules, observe and monitor executions (user/pass - admin/admin)" + }, + { + "env": "STATICFS_URL", + "name": "Static File Server", + "image": "Static-server.png", + "description": "Serve any static websites like a breeze" + }, + { + "env": "MC_URL", + "name": "M.Commander", + "image": "MC.jpg", + "description": "Feature rich visual file manager with internal text viewer and editor" + }, + { + "env": "HTOP_URL", + "name": "Process monitor", + "image": "Htop.jpg", + "description": "Monitor running process and resource utilization" + } + ] +%} + + +
+ {% for tool in tools %} + {% set tool_url = get_tool_url(tool.env) %} +
+ {% if tool.subpath is defined %} + + {% else %} + + {% endif %} + + + +
{{ tool.name }}
+
+
{{ tool.description }}
+
+ {% endfor %} +
+ + + + + diff --git a/workspaces/sqlite-workspace/mkdocs/admin/Cronicle.jpg b/workspaces/sqlite-workspace/mkdocs/admin/Cronicle.jpg new file mode 100644 index 0000000..03c56be Binary files /dev/null and b/workspaces/sqlite-workspace/mkdocs/admin/Cronicle.jpg differ diff --git a/workspaces/sqlite-workspace/mkdocs/admin/Htop.jpg b/workspaces/sqlite-workspace/mkdocs/admin/Htop.jpg new file mode 100644 index 0000000..994bc13 Binary files /dev/null and b/workspaces/sqlite-workspace/mkdocs/admin/Htop.jpg differ diff --git a/workspaces/sqlite-workspace/mkdocs/admin/MC.jpg b/workspaces/sqlite-workspace/mkdocs/admin/MC.jpg new file mode 100644 index 0000000..9b0a92a Binary files /dev/null and b/workspaces/sqlite-workspace/mkdocs/admin/MC.jpg differ diff --git a/workspaces/sqlite-workspace/mkdocs/admin/Static-server.png b/workspaces/sqlite-workspace/mkdocs/admin/Static-server.png new file mode 100644 index 0000000..4d8fa6b Binary files /dev/null and b/workspaces/sqlite-workspace/mkdocs/admin/Static-server.png differ diff --git a/workspaces/sqlite-workspace/mkdocs/extra.css b/workspaces/sqlite-workspace/mkdocs/extra.css index 68e8aa8..d1fd947 100644 --- a/workspaces/sqlite-workspace/mkdocs/extra.css +++ b/workspaces/sqlite-workspace/mkdocs/extra.css @@ -1,4 +1,4 @@ -[data-md-color-scheme="sqite"] { +[data-md-color-scheme="sqlite"] { --md-primary-fg-color: #044A64; --md-accent-fg-color: #0482C9; @@ -6,7 +6,7 @@ --md-default-bg-color: #F5F7F7; } -[data-md-color-scheme="sqite-dark"] { +[data-md-color-scheme="sqlite-dark"] { --md-primary-fg-color: #0482C9; --md-accent-fg-color: #19758F; diff --git a/workspaces/sqlite-workspace/mkdocs/helpers.py b/workspaces/sqlite-workspace/mkdocs/helpers.py index ad30707..b982f10 100644 --- a/workspaces/sqlite-workspace/mkdocs/helpers.py +++ b/workspaces/sqlite-workspace/mkdocs/helpers.py @@ -8,9 +8,13 @@ import os port_increments = { "DOCS_URL": 0, "FILEBROWSER_URL": 1, + "STATICFS_URL": 2, + "CRONICLE_URL": 3, "UNGIT_URL": 4, "IDE_URL": 5, "TERMINAL_URL": 6, + "MC_URL": 7, + "HTOP_URL": 8, "DBDESIGNER_URL": 9, "PORT_8038": 18, "PORT_8039": 19, diff --git a/workspaces/sqlite-workspace/mkdocs/mkdocs.yml b/workspaces/sqlite-workspace/mkdocs/mkdocs.yml index 2e4af23..471fa86 100644 --- a/workspaces/sqlite-workspace/mkdocs/mkdocs.yml +++ b/workspaces/sqlite-workspace/mkdocs/mkdocs.yml @@ -5,6 +5,7 @@ nav: - Home: README.md - My apps: pages/my-apps.md + - Admin: pages/admin.md - About: about.md - Docs: https://docs.alnoda.org/sqlite-workspace/ diff --git a/workspaces/sqlite-workspace/supervisord-sqlite.conf b/workspaces/sqlite-workspace/supervisord-sqlite.conf index 303b518..7dec8bf 100644 --- a/workspaces/sqlite-workspace/supervisord-sqlite.conf +++ b/workspaces/sqlite-workspace/supervisord-sqlite.conf @@ -14,14 +14,6 @@ stdout_logfile = /var/log/dbdesigner/dbdesigner-stdout.log logfile_maxbytes = 1024 -[program:nocodb] -directory=/home/nocodb -command=/bin/sh -c "cd /home/nocodb && . env/bin/activate && npm start" # port is defined by PORT env var -stderr_logfile = /var/log/nocodb/nocodb-stderr.log -stdout_logfile = /var/log/nocodb/nocodb-stdout.log -logfile_maxbytes = 1024 - - [program:sqlite-web-nocodb] directory=/home/project/ command=/bin/sh -c "sqlite_web /home/nocodb/noco.db --host 0.0.0.0 --port 8031 --no-browser -e /home/sqlite-extensions/fileio.so -e /home/sqlite-extensions/fuzzy.so -e /home/sqlite-extensions/ipaddr.so -e /home/sqlite-extensions/re.so -e /home/sqlite-extensions/spellfix.so -e /home/sqlite-extensions/stats.so -e /home/sqlite-extensions/text.so -e /home/sqlite-extensions/unicode.so -e /home/sqlite-extensions/uuid.so "