From 984ae06a2dbf6b425de0bfecfd4ae7224e144924 Mon Sep 17 00:00:00 2001 From: sanghee Date: Fri, 7 Feb 2020 17:41:44 +0100 Subject: [PATCH 1/5] link fixed --- content/u/deals/valentine-machine-2020/contents.lr | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/content/u/deals/valentine-machine-2020/contents.lr b/content/u/deals/valentine-machine-2020/contents.lr index baa38a0..c5c9ffe 100644 --- a/content/u/deals/valentine-machine-2020/contents.lr +++ b/content/u/deals/valentine-machine-2020/contents.lr @@ -40,8 +40,7 @@ All VMs from ungleich are fully **zero carbon**. No CO2 emissions from running a ## 14% discount on valentine machines To make it easier to give a cool VM to your beloved one, we give you a -14% discount on any VM that you buy on [IPv6Onlyhosting.com] -(https://ipv6onlyhosting.com) or +14% discount on any VM that you buy on [IPv6Onlyhosting.com](https://ipv6onlyhosting.com) or [DataCenterLight.ch](https://datacenterlight.ch) from 2020-02-07 to 2020-02-14. ## How to get 14% discount From d46927ec3b58c938148fd594b9e0aae327532698 Mon Sep 17 00:00:00 2001 From: sanghee Date: Fri, 7 Feb 2020 17:43:39 +0100 Subject: [PATCH 2/5] email changed --- content/u/deals/valentine-machine-2020/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/u/deals/valentine-machine-2020/contents.lr b/content/u/deals/valentine-machine-2020/contents.lr index c2ae450..817c016 100644 --- a/content/u/deals/valentine-machine-2020/contents.lr +++ b/content/u/deals/valentine-machine-2020/contents.lr @@ -46,6 +46,6 @@ To make it easier to give a cool VM to your beloved one, we give you a ## How to get 14% discount -Order a VM during the Valentine Machine week 2020-02-07 to 2020-02-14 and go through the checkout, and send us the following message to support@datacenterlight.ch +Order a VM during the Valentine Machine week 2020-02-07 to 2020-02-14 and go through the checkout, and send us the following message to vm@zerocarbon.shop "I want a zero carbon Valentine's day!" As soon as our team checks your message, we will apply the discount for your VM subscription. From a57401123590c829d7c82a77c66ea75f96d9a69a Mon Sep 17 00:00:00 2001 From: sanghee Date: Fri, 7 Feb 2020 17:46:08 +0100 Subject: [PATCH 3/5] typo fixed --- content/u/deals/valentine-machine-2020/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/u/deals/valentine-machine-2020/contents.lr b/content/u/deals/valentine-machine-2020/contents.lr index 817c016..9549653 100644 --- a/content/u/deals/valentine-machine-2020/contents.lr +++ b/content/u/deals/valentine-machine-2020/contents.lr @@ -28,7 +28,7 @@ description1: ## Valentine Machines -Imagine this: instead of the conventional presents we've all seen over and over, give your +Imagine this: instead of the conventional gifts we've all seen over and over, giving your beloved geek something creative. Something that they can enjoy even after the Valentine's day. And save the planet in the meantime. From 56416953f91dd9fb1749f87a00589ef19be790dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= Date: Fri, 7 Feb 2020 18:46:02 +0100 Subject: [PATCH 4/5] Fix Mattermost link generation on Matrix page --- content/u/products/hosted-matrix-chat/contents.lr | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/content/u/products/hosted-matrix-chat/contents.lr b/content/u/products/hosted-matrix-chat/contents.lr index cd9ce65..b6dd3ab 100644 --- a/content/u/products/hosted-matrix-chat/contents.lr +++ b/content/u/products/hosted-matrix-chat/contents.lr @@ -170,10 +170,10 @@ on our -You might be also interested in our [Mattermost-based chat -offer](../zero-carbon-chat), which might be closer to what you expect for a -enterprise team chat at the moment. We use both at ungleich, since Matrix is -especially convenient to reach out to the world! +You might be also interested in our Mattermost-based chat offer, which might be +closer to what you expect for a enterprise team chat at the moment. We use both +at ungleich, since Matrix is especially convenient to reach out to the world! --- From f6f65fd8c58a00b9e870d0c97ac340d1b7373281 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= Date: Fri, 7 Feb 2020 19:36:25 +0100 Subject: [PATCH 5/5] Use prebuilt image for CI --- .gitlab-ci.yml | 8 +------- Dockerfile | 7 +++++++ 2 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 Dockerfile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6cced24..7a6dbe7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,15 +2,12 @@ stages: - build - deploy -image: debian:latest +image: registry.gitlab.com/fnux/ungleich-images/staticcms-ci:latest variables: BUILDDIR: "build/" build: stage: build - before_script: - - apt-get update - - apt-get install -y make lektor imagemagick script: - make build artifacts: @@ -26,9 +23,6 @@ deploy: name: production url: https://ungleich.ch/ before_script: - # Install dependencies - - apt-get update - - apt-get install -y make openssh-client rsync # Configure the SSH Agent - eval $(ssh-agent -s) - echo "$CD_SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..ad99858 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,7 @@ +# This image used for CI. + +FROM debian:latest +MAINTAINER Timothée Floure + +RUN apt-get update +RUN apt-get install -y make lektor imagemagick openssh-client rsync