Compare commits

...

20 Commits

Author SHA1 Message Date
417453a9d2 stg deploy
All checks were successful
Deploy latest to staging environment / tag-image (push) Successful in 5s
Deploy latest to staging environment / deploy (push) Successful in 6s
2023-08-19 17:19:52 -07:00
fd69bc370d publish image
All checks were successful
Build and publish container images / build-and-publish (push) Successful in 52s
2023-08-19 17:18:49 -07:00
0eb3e467d7 meta tag for responsive layout 2023-08-19 17:17:40 -07:00
9fcf539950 stg deploy
All checks were successful
Deploy latest to staging environment / tag-image (push) Successful in 5s
Deploy latest to staging environment / deploy (push) Successful in 8s
2023-08-19 16:25:27 -07:00
313ea12497 qrcode example
All checks were successful
Build and publish container images / build-and-publish (push) Successful in 51s
2023-08-19 16:24:56 -07:00
b3b2e25aae stg deploy
All checks were successful
Deploy latest to staging environment / tag-image (push) Successful in 6s
Deploy latest to staging environment / deploy (push) Successful in 6s
2023-08-19 16:12:54 -07:00
35b3d87f52 build image
All checks were successful
Build and publish container images / build-and-publish (push) Successful in 51s
2023-08-19 15:35:48 -07:00
c54375ceec remove base url from config 2023-08-19 15:35:25 -07:00
2eb456b872 typos 2023-08-19 14:17:12 -07:00
764edb45c7 stg deploy
All checks were successful
Deploy latest to staging environment / tag-image (push) Successful in 6s
Deploy latest to staging environment / deploy (push) Successful in 6s
2023-08-19 14:12:24 -07:00
8ce3b0eb00 build image with stg base url
All checks were successful
Build and publish container images / build-and-publish (push) Successful in 52s
2023-08-19 14:09:58 -07:00
d682413077 publish new image with / base url
Some checks failed
Build and publish container images / build-and-publish (push) Failing after 51s
2023-08-19 14:07:18 -07:00
36e86af0c1 stg deploy
All checks were successful
Deploy latest to staging environment / tag-image (push) Successful in 6s
Deploy latest to staging environment / deploy (push) Successful in 15s
2023-08-19 14:01:21 -07:00
85db30a36f publish new image
All checks were successful
Build and publish container images / build-and-publish (push) Successful in 52s
2023-08-19 13:59:17 -07:00
1f6249b334 copy source files better
All checks were successful
Build container images / build (push) Successful in 1m3s
2023-08-19 13:58:03 -07:00
f156ec512b more logging
Some checks failed
Build container images / build (push) Failing after 31s
2023-08-19 13:53:51 -07:00
05ffb83eb3 build with logging
All checks were successful
Build container images / build (push) Successful in 39s
2023-08-19 13:51:01 -07:00
28ed961afc stg deploy
All checks were successful
Deploy latest to staging environment / tag-image (push) Successful in 5s
Deploy latest to staging environment / deploy (push) Successful in 11s
2023-08-19 13:47:51 -07:00
5b7fad82a9 build new image
All checks were successful
Build and publish container images / build-and-publish (push) Successful in 1m21s
2023-08-19 13:45:53 -07:00
3f44d37f8f update file ownership in container 2023-08-19 13:40:47 -07:00
10 changed files with 92 additions and 43 deletions

View File

@@ -2,7 +2,7 @@
name: Build and publish container images
on:
- workflow_dispatch
workflow_dispatch: { }
# push:
# branches:
# - master
@@ -47,4 +47,4 @@ jobs:
# linux/arm/v6
build-args: |
DOC_UTILS_VERSION=0.2
NGINX_VERSION=1.25
NGINX_VERSION=1.25-alpine-slim

View File

@@ -2,7 +2,7 @@
name: Build container images
on:
- workflow_dispatch
workflow_dispatch: { }
# push:
# branches:
# - master
@@ -38,4 +38,4 @@ jobs:
# linux/arm/v6
build-args: |
DOC_UTILS_VERSION=0.2
NGINX_VERSION=1.25
NGINX_VERSION=1.25-alpine-slim

View File

@@ -2,7 +2,10 @@
name: Deploy staging to production environment
on:
- workflow_dispatch
workflow_dispatch: { }
# push:
# branches:
# - master
jobs:
tag-image:

View File

@@ -2,7 +2,7 @@
name: Deploy latest to staging environment
on:
# - workflow_dispatch
workflow_dispatch: { }
push:
branches:
- master

View File

@@ -5,8 +5,12 @@ ARG NGINX_VERSION
FROM gitea.jbrumond.me/doc-utils/utils:${DOC_UTILS_VERSION} AS build_stage
WORKDIR /workspace
COPY docs/ /workspace/docs
COPY layouts/ /workspace/layouts
COPY partials/ /workspace/partials
COPY config.yaml metadata.json /workspace/
# build website from source files
COPY docs layouts partials config.yaml metadata.json /workspace/
RUN mkdir /workspace/www
RUN docs2website config.yaml
@@ -16,10 +20,9 @@ FROM nginx:${NGINX_VERSION} AS deploy_stage
EXPOSE 80
# copy actual web content built above
COPY --from=build_stage /workspace/www/ /usr/share/nginx/html
RUN chmod -R +rX /usr/share/nginx/html
COPY --from=build_stage --chown=nginx:nginx /workspace/www/ /usr/share/nginx/html
# nginx config files
COPY conf/nginx.conf /etc/nginx/nginx.conf
COPY conf/default.conf /etc/nginx/conf.d/default.conf
COPY conf/mime.types /etc/nginx/mime.types
COPY --chown=nginx:nginx conf/nginx.conf /etc/nginx/nginx.conf
COPY --chown=nginx:nginx conf/default.conf /etc/nginx/conf.d/default.conf
COPY --chown=nginx:nginx conf/mime.types /etc/nginx/mime.types

View File

@@ -1,7 +1,7 @@
metadata: ./metadata.json
base_url: http://localhost:46137
# base_url: http://localhost:46137
# Input Configuration (where your documents are)
input:

View File

@@ -135,6 +135,35 @@ Indentation in `<dl>` blocks must two consecutive spaces; Other indentation styl
## Section Blocks {#sections}
HTML `<section>` elements can be rendered around portions of your document by fencing them in triple-bang blocks (i.e. preceded and followed by `!!!`).
```md
!!!
This is inside a `<section>` element
!!!
```
!!!! {.markdown-example-output}
!!!
This is inside a `<section>` element
!!!
!!!!
Similarly to fenced code blocks, you can nest these fenced blocks by adding additional bang (`!`) characters to the opening and closing lines.
These blocks also support [attribute annotations](#attribute-annotations) on the first line:
```md
!!! {.editors-note :role=note}
**Editor's Note:**
Section blocks can be used to create special call-out blocks
!!!
```
## Feather Icons {#feather}
@@ -243,7 +272,19 @@ _todo_
## QR Codes {#qr-codes}
_todo_
QR Codes can be rendered using fenced blocks.
````md
```qrcode :small
https://doc-utils.jbrumond.me/markdown2html/markdown-format.html
```
````
!!! {.markdown-example-output}
```qrcode :small
https://doc-utils.jbrumond.me/markdown2html/markdown-format.html
```
!!!
@@ -308,7 +349,7 @@ This is another line of sample output
Some markdown elements allow for attributes to be appended in a curly-brace (`{ }`) wrapped block.
The braces contain a space-delimeted list attributes to assign to the rendered attribute, identified as either:
The braces contain a space-delimited list of attributes to assign to the rendered element, identified as either:
- An `id` attribute, prefixed by a `#` character,
- A `class` attribute value, prefixed by `.` character,

View File

@@ -4,6 +4,7 @@
<meta charset="UTF-8">
<title>{{ page.title }}</title>
<base href="{{{ page_url }}}">
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="/_vendor/open-sans/open-sans-v34.css">
<link rel="stylesheet" href="/_vendor/katex/katex.min.css">
<link rel="stylesheet" href="/_assets/colors.css">

View File

@@ -4,6 +4,7 @@
<meta charset="UTF-8">
<title>{{ page.title }}</title>
<base href="{{{ page_url }}}">
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="/_vendor/open-sans/open-sans-v34.css">
<link rel="stylesheet" href="/_vendor/katex/katex.min.css">
<link rel="stylesheet" href="/_assets/colors.css">

View File

@@ -1,7 +1,7 @@
{
"last_build": {
"time": "2023-05-27T18:14:11.014-07:00",
"config_hash": "iZVIBu7zTewWsPUbEDMgC+ROqW2Q9n0cmgGuBh93jjvm/M2B3QjsdN6cYsSZ0yO4xx5Sk2wrcOkpQJp1Urq0Fg=="
"time": "2023-08-19T17:17:00.889-07:00",
"config_hash": "uE1vXrV0+DVs3fpCIPIUlu7niYXyfxOe0JMGwmlUN/RzI5jJMW7A+8B5V2tK0CKdGVjmtwo+weTWXgF9N9JBIw=="
},
"files": {
"/_assets/theme-animation.css": {
@@ -14,9 +14,9 @@
"last_build_hash": "XtOPnd/zOEAr0DByWuvGfJyTHsdDIXTiZny5g2M2gItpdw/Ce8jaJ1hCMC72AIjkelYl1icrsqAfjNs6dtnn+A==",
"last_updated_time": "2023-05-19T00:06:52.103-07:00"
},
"/_assets/forms-inputs.css": {
"/_assets/figures.css": {
"first_seen_time": "2023-05-19T00:06:52.103-07:00",
"last_build_hash": "vKON+tNIef2LVqhNv6IlMaHZW7gr40F7lbd9mLWYg9k0Kqrn1Nyon1Nf3t63hjNq/V6IAeV7+9svHCJqIiGj5g==",
"last_build_hash": "GWqAs7DM3p2pZe37WHjRTBvPs/ft77X7v8hLb6AjU3nwEoSwgqyhvXnHSycmfXKAiQj9745tHnnpVU7gSbfS4Q==",
"last_updated_time": "2023-05-19T00:06:52.103-07:00"
},
"/_assets/prism.css": {
@@ -24,14 +24,9 @@
"last_build_hash": "wULo4ZHx6x9XHCZVV0v1Jp9dZ/tP2UiGgp3S61FJsebGoWzQIty/DF2Oyoo5cuVn+3Sg21P5clcacbF9SL04nw==",
"last_updated_time": "2023-05-19T00:06:52.103-07:00"
},
"/_assets/figures.css": {
"/_assets/forms-inputs.css": {
"first_seen_time": "2023-05-19T00:06:52.103-07:00",
"last_build_hash": "GWqAs7DM3p2pZe37WHjRTBvPs/ft77X7v8hLb6AjU3nwEoSwgqyhvXnHSycmfXKAiQj9745tHnnpVU7gSbfS4Q==",
"last_updated_time": "2023-05-19T00:06:52.103-07:00"
},
"/_assets/extras.js": {
"first_seen_time": "2023-05-19T00:06:52.103-07:00",
"last_build_hash": "NH5RPkRjdvMpOm4QppT7blGPGdNK5b2J+cQ6Wsv22cmDfm3b7Tc9GeZn4qd5D+fTSoGoESNarEnN+sRV1ihrRA==",
"last_build_hash": "vKON+tNIef2LVqhNv6IlMaHZW7gr40F7lbd9mLWYg9k0Kqrn1Nyon1Nf3t63hjNq/V6IAeV7+9svHCJqIiGj5g==",
"last_updated_time": "2023-05-19T00:06:52.103-07:00"
},
"/_assets/colors.css": {
@@ -39,9 +34,9 @@
"last_build_hash": "UteDx72dZXzdJcv/IO6dluhgiN9ddwTn1GDGek4F7cYPRYQv/RDD4cuI97/Yxf+89ykpoKcmHHqt6Tudxi1H8A==",
"last_updated_time": "2023-05-19T00:06:52.103-07:00"
},
"/_assets/color-theme-preview.css": {
"/_assets/extras.js": {
"first_seen_time": "2023-05-19T00:06:52.103-07:00",
"last_build_hash": "ggmN8fAn+W3ejVa+WjwgwCrqe/TD2lr3kmG77TUHrwDAuE8wOeWEmPV/YzhD9f57eYIA+ZHypp9s797CDjpbpA==",
"last_build_hash": "NH5RPkRjdvMpOm4QppT7blGPGdNK5b2J+cQ6Wsv22cmDfm3b7Tc9GeZn4qd5D+fTSoGoESNarEnN+sRV1ihrRA==",
"last_updated_time": "2023-05-19T00:06:52.103-07:00"
},
"/_assets/breadcrumb.css": {
@@ -49,6 +44,11 @@
"last_build_hash": "B3ajZA+BTRFIWfk6CA/Sa71n8MFp5GPB9TWsNLi0VrIV+N0hWiAJvSvnhV2BgHzRXooT1WWotLne7hgDi5qJcw==",
"last_updated_time": "2023-05-19T00:06:52.103-07:00"
},
"/_assets/color-theme-preview.css": {
"first_seen_time": "2023-05-19T00:06:52.103-07:00",
"last_build_hash": "ggmN8fAn+W3ejVa+WjwgwCrqe/TD2lr3kmG77TUHrwDAuE8wOeWEmPV/YzhD9f57eYIA+ZHypp9s797CDjpbpA==",
"last_updated_time": "2023-05-19T00:06:52.103-07:00"
},
"/_vendor/open-sans/open-sans-v34.css": {
"first_seen_time": "2023-05-19T00:06:52.103-07:00",
"last_build_hash": "8rNJHIlE33r84MLmf+pOCU68Lr1iZYUeFIpZ8d2xB4U3cEV/W1ejc/JStY/MXCxLSOURx5KdULaKiP1klKGoAQ==",
@@ -99,20 +99,15 @@
"last_build_hash": "z4PhNX7vuL3xVChQ1m2AB9Yg5AULVxXcg/SpIdNs6c5H0NE8XYXysP+DGNKHfuwvY7kxvUdBeoGlODJ6+SfaPg==",
"last_updated_time": "2023-05-19T00:06:52.103-07:00"
},
"/markdown2html/index.md": {
"first_seen_time": "2023-05-19T00:06:52.103-07:00",
"last_build_hash": "IVJ7BVd9RqXGiZjl+57k9itDrZy6WIG/TjvkK/r7DqkIzlCIbABtyZfmdjVoFgdliJwSAwnMTFikbKqUV5w5zQ==",
"last_updated_time": "2023-05-19T00:06:52.103-07:00"
},
"/markdown2html/building-from-source.md": {
"first_seen_time": "2023-05-19T00:06:52.103-07:00",
"last_build_hash": "Y0Gct7zFDfLxzXqRph3RjfZ7OjGu5s1cac/R4E1dG9XZiyDOiFYl6EA1EqCfM6qhBSoxcpIYNFP9+TXxo09GFw==",
"last_updated_time": "2023-05-19T00:06:52.103-07:00"
},
"/docs2website/index.md": {
"/markdown2html/index.md": {
"first_seen_time": "2023-05-19T00:06:52.103-07:00",
"last_build_hash": "oGqQtPmVdLea18qkpFrA6XayZd6IFrlesgoo9bxzgx+ibbMK4cJ//jsQyPGRc6QuW2daJZS2gnPo4QygHh65vA==",
"last_updated_time": "2023-05-27T17:50:24.808-07:00"
"last_build_hash": "IVJ7BVd9RqXGiZjl+57k9itDrZy6WIG/TjvkK/r7DqkIzlCIbABtyZfmdjVoFgdliJwSAwnMTFikbKqUV5w5zQ==",
"last_updated_time": "2023-05-19T00:06:52.103-07:00"
},
"/docs2website/configuration.md": {
"first_seen_time": "2023-05-19T00:06:52.103-07:00",
@@ -124,6 +119,11 @@
"last_build_hash": "8eN9+TPZCdHz8zvZFRHZOIKOTkc3jGt/vaXTmlJNwKMYVw14eQB5MYn/DwEDUkg5X5vtAKNO6knlfdsyv5ODuA==",
"last_updated_time": "2023-05-27T17:48:44.437-07:00"
},
"/docs2website/index.md": {
"first_seen_time": "2023-05-19T00:06:52.103-07:00",
"last_build_hash": "oGqQtPmVdLea18qkpFrA6XayZd6IFrlesgoo9bxzgx+ibbMK4cJ//jsQyPGRc6QuW2daJZS2gnPo4QygHh65vA==",
"last_updated_time": "2023-05-27T17:50:24.808-07:00"
},
"/docs2website/building-from-source.md": {
"first_seen_time": "2023-05-19T00:06:52.103-07:00",
"last_build_hash": "nR+ORQrII8uVXBbNEZGWLTSR7lDW8faZlVK50WjZd9esf47rofpLoHSBABf77OKvFlrPD3RWyKVwIQaWC+U9VA==",
@@ -139,20 +139,20 @@
"last_build_hash": "7/5Kwma++r3MFm7KET9N4E2+f5Fbm/LPZoZLIakt6Tj68WnjQ0ygx1kmOuLaqhq5hlFtyvUmqUWVfvt4QhT3+A==",
"last_updated_time": "2023-05-27T17:55:56.863-07:00"
},
"/docs2website/programatic-use.md": {
"first_seen_time": "2023-05-19T00:06:52.103-07:00",
"last_build_hash": "oy6eFcHsBwyhv8hI10jbmi392GGBgo5MsR68qP8wN7xu0ny+7BDUcJyp2KK28wwASnDd/zSOSgEx/9rmxG/O6w==",
"last_updated_time": "2023-05-19T00:06:52.103-07:00"
},
"/color-themes/preview.md": {
"first_seen_time": "2023-05-19T00:06:52.103-07:00",
"last_build_hash": "zMiA4rvAFVXAI2fx6VCFXavfkZSuVxO7bH5hxIU79Tup8Q6lOjXrzT9CPsHYBuNajVDwZIPZ126fKiwM6TSNFQ==",
"last_updated_time": "2023-05-19T00:06:52.103-07:00"
},
"/docs2website/programatic-use.md": {
"first_seen_time": "2023-05-19T00:06:52.103-07:00",
"last_build_hash": "oy6eFcHsBwyhv8hI10jbmi392GGBgo5MsR68qP8wN7xu0ny+7BDUcJyp2KK28wwASnDd/zSOSgEx/9rmxG/O6w==",
"last_updated_time": "2023-05-19T00:06:52.103-07:00"
},
"/markdown2html/markdown-format.md": {
"first_seen_time": "2023-05-19T00:06:52.103-07:00",
"last_build_hash": "i/quZAVVMVDaTsq44d4eezoddkUsRCdydU609LkbMqEt1397zHsix2e1AMM4D+Lgzxxk6JIhqX1fSOO/1+3VKw==",
"last_updated_time": "2023-05-27T18:14:11.014-07:00"
"last_build_hash": "u7W15JZzkqveONMa6ErF/EEBlvO3jKn4hHmM2HNoY6bpqSElWx8RiEOXYSyPINR7F+YncCqubHTta/NOYfky4g==",
"last_updated_time": "2023-08-19T16:54:55.074-07:00"
},
"/color-themes/schema/v1.yaml": {
"first_seen_time": "2023-05-19T00:06:52.103-07:00",