From ca392fa47885280d013e9ffe71c96c89ab0857cc Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Sun, 2 May 2021 14:36:15 +0900 Subject: [PATCH 01/16] Initial try to generate OGP image by Drone. --- .drone.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.drone.yml b/.drone.yml index c8b8ab7..7d1c449 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,6 +9,11 @@ steps: - grep -l -r ecx.images-amazon.com content/ | sort | uniq | xargs -t --no-run-if-empty sed -ie "s/http:\/\/ecx.images-amazon.com/https:\/\/images-na.ssl-images-amazon.com/g" - grep -l -r "http://www.amazon.co.jp/exec" content/ | sort | uniq | xargs -t --no-run-if-empty sed -i -e "s/http:\/\/www.amazon.co.jp\/exec/https:\/\/www.amazon.co.jp\/exec/g" + - name: generate-ogp-images + image: reg.kazu634.com/kazu634/tcardgen + commands: + - /entrypoint.sh + - name: hugo image: cibuilds/hugo:0.83.0 commands: From cda1fde1ff3de491a0b27d904b048f9e21228f2d Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Sun, 2 May 2021 14:37:24 +0900 Subject: [PATCH 02/16] 2nd try to generate the OGP images. --- .drone.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.drone.yml b/.drone.yml index 7d1c449..7864027 100644 --- a/.drone.yml +++ b/.drone.yml @@ -67,6 +67,11 @@ steps: - grep -l -r ecx.images-amazon.com content/ | sort | uniq | xargs -t --no-run-if-empty sed -ie "s/http:\/\/ecx.images-amazon.com/https:\/\/images-na.ssl-images-amazon.com/g" - grep -l -r "http://www.amazon.co.jp/exec" content/ | sort | uniq | xargs -t --no-run-if-empty sed -i -e "s/http:\/\/www.amazon.co.jp\/exec/https:\/\/www.amazon.co.jp\/exec/g" + - name: generate-ogp-images + image: reg.kazu634.com/kazu634/tcardgen + commands: + - /entrypoint.sh + - name: hugo image: cibuilds/hugo:0.83.0 commands: From 3218626637561c18c98796ecdc0e37636376f4ef Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Sun, 2 May 2021 14:38:31 +0900 Subject: [PATCH 03/16] 3rd try. --- .drone.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 7864027..50cfe30 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,8 +11,6 @@ steps: - name: generate-ogp-images image: reg.kazu634.com/kazu634/tcardgen - commands: - - /entrypoint.sh - name: hugo image: cibuilds/hugo:0.83.0 From 979bfe85a3b9e64c2e8d859caf8a80b9d3db23b4 Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Sun, 2 May 2021 14:50:23 +0900 Subject: [PATCH 04/16] 4th try. --- .drone.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.drone.yml b/.drone.yml index 50cfe30..bd43f9d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,6 +11,17 @@ steps: - name: generate-ogp-images image: reg.kazu634.com/kazu634/tcardgen + environment: + OGP_DIR: static/ogp/ + CONTENT_DIR: content/ + FONT_DIR: assets/font/ + CONFIG: assets/tcardgen.yaml + commands: + - find ${OGP_DIR} -type f -name '*.png' | xargs -t --no-run-if-empty rm + - LIST=`find ${CONTENT_DIR} -type f -name '*.md' | grep -v '_index'` + - for ARTICLE in ${LIST} ; do + - /tcardgen -f ${FONT_DIR} -o ${OGP_DIR} -c ${CONFIG} ${ARTICLE} + - done - name: hugo image: cibuilds/hugo:0.83.0 From ff1b09174eb3f93a5867b5da375102cc950494ce Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Sun, 2 May 2021 14:54:17 +0900 Subject: [PATCH 05/16] 5th try --- .drone.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index bd43f9d..29840a9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -78,8 +78,17 @@ steps: - name: generate-ogp-images image: reg.kazu634.com/kazu634/tcardgen + environment: + OGP_DIR: static/ogp/ + CONTENT_DIR: content/ + FONT_DIR: assets/font/ + CONFIG: assets/tcardgen.yaml commands: - - /entrypoint.sh + - find ${OGP_DIR} -type f -name '*.png' | xargs -t --no-run-if-empty rm + - LIST=`find ${CONTENT_DIR} -type f -name '*.md' | grep -v '_index'` + - for ARTICLE in ${LIST} ; do + - /tcardgen -f ${FONT_DIR} -o ${OGP_DIR} -c ${CONFIG} ${ARTICLE} + - done - name: hugo image: cibuilds/hugo:0.83.0 From 42ad3a56d725a5589f6331c12fe131db6baa72ae Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Sun, 2 May 2021 14:58:22 +0900 Subject: [PATCH 06/16] 6th try --- .drone.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 29840a9..a437f6e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -84,11 +84,8 @@ steps: FONT_DIR: assets/font/ CONFIG: assets/tcardgen.yaml commands: - - find ${OGP_DIR} -type f -name '*.png' | xargs -t --no-run-if-empty rm - - LIST=`find ${CONTENT_DIR} -type f -name '*.md' | grep -v '_index'` - - for ARTICLE in ${LIST} ; do - - /tcardgen -f ${FONT_DIR} -o ${OGP_DIR} -c ${CONFIG} ${ARTICLE} - - done + - find static/ogp/ -type f -name '*.png' | xargs -t --no-run-if-empty rm + - find content/ -type f -name '*.md' | grep -v '_index' | xargs -n 1 -t /tcardgen -f assets/font/ -o static/ogp/ -c assets/tcardgen.yaml - name: hugo image: cibuilds/hugo:0.83.0 From 2c018f2642fc9f69f6e90e405ebea955fd314e79 Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Sun, 2 May 2021 15:01:18 +0900 Subject: [PATCH 07/16] 7th try. --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index a437f6e..3e619a5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -85,7 +85,7 @@ steps: CONFIG: assets/tcardgen.yaml commands: - find static/ogp/ -type f -name '*.png' | xargs -t --no-run-if-empty rm - - find content/ -type f -name '*.md' | grep -v '_index' | xargs -n 1 -t /tcardgen -f assets/font/ -o static/ogp/ -c assets/tcardgen.yaml + - find content/ -type f -name '*.md' | grep -v '_index' | xargs -n 1 -t tcardgen -f assets/font/ -o static/ogp/ -c assets/tcardgen.yaml - name: hugo image: cibuilds/hugo:0.83.0 From 5afca5e21d9f6b19c9db93f7bf784d5ef744d308 Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Sun, 2 May 2021 15:06:55 +0900 Subject: [PATCH 08/16] 8th try. --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 3e619a5..fbdc56a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -77,7 +77,7 @@ steps: - grep -l -r "http://www.amazon.co.jp/exec" content/ | sort | uniq | xargs -t --no-run-if-empty sed -i -e "s/http:\/\/www.amazon.co.jp\/exec/https:\/\/www.amazon.co.jp\/exec/g" - name: generate-ogp-images - image: reg.kazu634.com/kazu634/tcardgen + image: reg.kazu634.com/kazu634/tcardgen:v0.1 environment: OGP_DIR: static/ogp/ CONTENT_DIR: content/ From a4ed83d0bdd24a83557668a1e80f6cbe509d7474 Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Sun, 2 May 2021 15:10:40 +0900 Subject: [PATCH 09/16] 9th try. --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index fbdc56a..d277918 100644 --- a/.drone.yml +++ b/.drone.yml @@ -84,8 +84,8 @@ steps: FONT_DIR: assets/font/ CONFIG: assets/tcardgen.yaml commands: - - find static/ogp/ -type f -name '*.png' | xargs -t --no-run-if-empty rm - - find content/ -type f -name '*.md' | grep -v '_index' | xargs -n 1 -t tcardgen -f assets/font/ -o static/ogp/ -c assets/tcardgen.yaml + - mkdir -p static/ogp/ + - find content/ -type f -name '*.md' | grep -v '_index' | xargs -n 1 -t /usr/local/bin/tcardgen -f assets/font/ -o static/ogp/ -c assets/tcardgen.yaml - name: hugo image: cibuilds/hugo:0.83.0 From afc2966e924834a62590c9b8f1dfc1de3606238d Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Sun, 2 May 2021 15:19:49 +0900 Subject: [PATCH 10/16] 10th try. --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index d277918..77d6098 100644 --- a/.drone.yml +++ b/.drone.yml @@ -77,7 +77,7 @@ steps: - grep -l -r "http://www.amazon.co.jp/exec" content/ | sort | uniq | xargs -t --no-run-if-empty sed -i -e "s/http:\/\/www.amazon.co.jp\/exec/https:\/\/www.amazon.co.jp\/exec/g" - name: generate-ogp-images - image: reg.kazu634.com/kazu634/tcardgen:v0.1 + image: reg.kazu634.com/kazu634/tcardgen:v0.2 environment: OGP_DIR: static/ogp/ CONTENT_DIR: content/ From e01adfc1fe7863a20ea6ed3074d1139145569039 Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Sun, 2 May 2021 15:30:21 +0900 Subject: [PATCH 11/16] 11th try. --- .drone.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index 77d6098..6448a08 100644 --- a/.drone.yml +++ b/.drone.yml @@ -78,14 +78,12 @@ steps: - name: generate-ogp-images image: reg.kazu634.com/kazu634/tcardgen:v0.2 - environment: - OGP_DIR: static/ogp/ - CONTENT_DIR: content/ - FONT_DIR: assets/font/ - CONFIG: assets/tcardgen.yaml commands: - mkdir -p static/ogp/ - - find content/ -type f -name '*.md' | grep -v '_index' | xargs -n 1 -t /usr/local/bin/tcardgen -f assets/font/ -o static/ogp/ -c assets/tcardgen.yaml + - wget 'https://github.com/yuru7/HackGen/releases/download/v2.3.0/HackGenNerd_v2.3.0.zip' -O /tmp/font.zip + - unzip /tmp/font.zip -d /tmp/font + - find /tmp/font -type f -name *.ttf | xargs -I% -n 1 cp -p % assets/font/ + - find content/ -type f -name '*.md' | grep -v '_index' | xargs -n 1 /usr/local/bin/tcardgen -f assets/font/ -o static/ogp/ -c assets/tcardgen.yaml - name: hugo image: cibuilds/hugo:0.83.0 From 7103a07f66a64ad9f1da1aa6e54001b7bfc71839 Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Sun, 2 May 2021 15:49:23 +0900 Subject: [PATCH 12/16] 12th try. --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index 6448a08..4159a84 100644 --- a/.drone.yml +++ b/.drone.yml @@ -84,6 +84,8 @@ steps: - unzip /tmp/font.zip -d /tmp/font - find /tmp/font -type f -name *.ttf | xargs -I% -n 1 cp -p % assets/font/ - find content/ -type f -name '*.md' | grep -v '_index' | xargs -n 1 /usr/local/bin/tcardgen -f assets/font/ -o static/ogp/ -c assets/tcardgen.yaml + - find static/ogp/ -type f -name '*.png' | xargs -I% -n 1 img2webp -lossy -q 50 % -o `echo % | sed -e 's/png/webp'` + - find static/ogp/ -type f -name '*.png' | xargs --no-run-if-empty rm - name: hugo image: cibuilds/hugo:0.83.0 From bce4c912d99befe3fc22da1570b1463bd3613e38 Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Sun, 2 May 2021 15:52:11 +0900 Subject: [PATCH 13/16] 13th try. --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 4159a84..b6fd414 100644 --- a/.drone.yml +++ b/.drone.yml @@ -83,7 +83,7 @@ steps: - wget 'https://github.com/yuru7/HackGen/releases/download/v2.3.0/HackGenNerd_v2.3.0.zip' -O /tmp/font.zip - unzip /tmp/font.zip -d /tmp/font - find /tmp/font -type f -name *.ttf | xargs -I% -n 1 cp -p % assets/font/ - - find content/ -type f -name '*.md' | grep -v '_index' | xargs -n 1 /usr/local/bin/tcardgen -f assets/font/ -o static/ogp/ -c assets/tcardgen.yaml + - find content/ -type f -name '*.md' | grep -v '_index' | xargs -n 1 /usr/local/bin/tcardgen -f assets/font/ -o static/ogp/ -c assets/tcardgen.yaml > /dev/null 2>&1 - find static/ogp/ -type f -name '*.png' | xargs -I% -n 1 img2webp -lossy -q 50 % -o `echo % | sed -e 's/png/webp'` - find static/ogp/ -type f -name '*.png' | xargs --no-run-if-empty rm From 4d6b07f5e79bc00d89a1d3c533f352764f94e94f Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Sun, 2 May 2021 15:56:40 +0900 Subject: [PATCH 14/16] 14th try. --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index b6fd414..26ff7fe 100644 --- a/.drone.yml +++ b/.drone.yml @@ -77,14 +77,14 @@ steps: - grep -l -r "http://www.amazon.co.jp/exec" content/ | sort | uniq | xargs -t --no-run-if-empty sed -i -e "s/http:\/\/www.amazon.co.jp\/exec/https:\/\/www.amazon.co.jp\/exec/g" - name: generate-ogp-images - image: reg.kazu634.com/kazu634/tcardgen:v0.2 + image: reg.kazu634.com/kazu634/tcardgen:v0.3 commands: - mkdir -p static/ogp/ - wget 'https://github.com/yuru7/HackGen/releases/download/v2.3.0/HackGenNerd_v2.3.0.zip' -O /tmp/font.zip - unzip /tmp/font.zip -d /tmp/font - find /tmp/font -type f -name *.ttf | xargs -I% -n 1 cp -p % assets/font/ - find content/ -type f -name '*.md' | grep -v '_index' | xargs -n 1 /usr/local/bin/tcardgen -f assets/font/ -o static/ogp/ -c assets/tcardgen.yaml > /dev/null 2>&1 - - find static/ogp/ -type f -name '*.png' | xargs -I% -n 1 img2webp -lossy -q 50 % -o `echo % | sed -e 's/png/webp'` + - find static/ogp/ -type f -name '*.png' | xargs -I% -n 1 img2webp -lossy -q 50 % -o `echo % | sed -e 's/png/webp/g'` - find static/ogp/ -type f -name '*.png' | xargs --no-run-if-empty rm - name: hugo From 90471816490f4fe608e3e12b83d766f9d5cb1a3b Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Sun, 2 May 2021 16:02:02 +0900 Subject: [PATCH 15/16] 15th try. --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 26ff7fe..b077fd8 100644 --- a/.drone.yml +++ b/.drone.yml @@ -84,7 +84,7 @@ steps: - unzip /tmp/font.zip -d /tmp/font - find /tmp/font -type f -name *.ttf | xargs -I% -n 1 cp -p % assets/font/ - find content/ -type f -name '*.md' | grep -v '_index' | xargs -n 1 /usr/local/bin/tcardgen -f assets/font/ -o static/ogp/ -c assets/tcardgen.yaml > /dev/null 2>&1 - - find static/ogp/ -type f -name '*.png' | xargs -I% -n 1 img2webp -lossy -q 50 % -o `echo % | sed -e 's/png/webp/g'` + - find static/ogp/ -type f -name '*.png' | xargs -I% -n 1 img2webp -lossy -q 50 % -o `echo % | sed -e 's/png/webp/g'` > /dev/null 2>&1 - find static/ogp/ -type f -name '*.png' | xargs --no-run-if-empty rm - name: hugo From 9ac988942e90a4922c6d56e1759007648098155b Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Sun, 2 May 2021 16:07:48 +0900 Subject: [PATCH 16/16] Generate OGP images only for production. --- .drone.yml | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/.drone.yml b/.drone.yml index b077fd8..c129685 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,18 +10,15 @@ steps: - grep -l -r "http://www.amazon.co.jp/exec" content/ | sort | uniq | xargs -t --no-run-if-empty sed -i -e "s/http:\/\/www.amazon.co.jp\/exec/https:\/\/www.amazon.co.jp\/exec/g" - name: generate-ogp-images - image: reg.kazu634.com/kazu634/tcardgen - environment: - OGP_DIR: static/ogp/ - CONTENT_DIR: content/ - FONT_DIR: assets/font/ - CONFIG: assets/tcardgen.yaml + image: reg.kazu634.com/kazu634/tcardgen:v0.3 commands: - - find ${OGP_DIR} -type f -name '*.png' | xargs -t --no-run-if-empty rm - - LIST=`find ${CONTENT_DIR} -type f -name '*.md' | grep -v '_index'` - - for ARTICLE in ${LIST} ; do - - /tcardgen -f ${FONT_DIR} -o ${OGP_DIR} -c ${CONFIG} ${ARTICLE} - - done + - mkdir -p static/ogp/ + - wget 'https://github.com/yuru7/HackGen/releases/download/v2.3.0/HackGenNerd_v2.3.0.zip' -O /tmp/font.zip + - unzip /tmp/font.zip -d /tmp/font + - find /tmp/font -type f -name *.ttf | xargs -I% -n 1 cp -p % assets/font/ + - find content/ -type f -name '*.md' | grep -v '_index' | xargs -n 1 /usr/local/bin/tcardgen -f assets/font/ -o static/ogp/ -c assets/tcardgen.yaml > /dev/null 2>&1 + - find static/ogp/ -type f -name '*.png' | xargs -I% -n 1 img2webp -lossy -q 50 % -o `echo % | sed -e 's/png/webp/g'` > /dev/null 2>&1 + - find static/ogp/ -type f -name '*.png' | xargs --no-run-if-empty rm - name: hugo image: cibuilds/hugo:0.83.0 @@ -76,17 +73,6 @@ steps: - grep -l -r ecx.images-amazon.com content/ | sort | uniq | xargs -t --no-run-if-empty sed -ie "s/http:\/\/ecx.images-amazon.com/https:\/\/images-na.ssl-images-amazon.com/g" - grep -l -r "http://www.amazon.co.jp/exec" content/ | sort | uniq | xargs -t --no-run-if-empty sed -i -e "s/http:\/\/www.amazon.co.jp\/exec/https:\/\/www.amazon.co.jp\/exec/g" - - name: generate-ogp-images - image: reg.kazu634.com/kazu634/tcardgen:v0.3 - commands: - - mkdir -p static/ogp/ - - wget 'https://github.com/yuru7/HackGen/releases/download/v2.3.0/HackGenNerd_v2.3.0.zip' -O /tmp/font.zip - - unzip /tmp/font.zip -d /tmp/font - - find /tmp/font -type f -name *.ttf | xargs -I% -n 1 cp -p % assets/font/ - - find content/ -type f -name '*.md' | grep -v '_index' | xargs -n 1 /usr/local/bin/tcardgen -f assets/font/ -o static/ogp/ -c assets/tcardgen.yaml > /dev/null 2>&1 - - find static/ogp/ -type f -name '*.png' | xargs -I% -n 1 img2webp -lossy -q 50 % -o `echo % | sed -e 's/png/webp/g'` > /dev/null 2>&1 - - find static/ogp/ -type f -name '*.png' | xargs --no-run-if-empty rm - - name: hugo image: cibuilds/hugo:0.83.0 commands: