typo contact

Lektor seems to be confused

.gitignore

@@ -1,3 +1,4 @@
 venv/
 .DS_Store
 .idea/
+.history

.gitlab-ci.yml

@@ -2,7 +2,7 @@ stages:
   - build
   - deploy
 
-image: registry.gitlab.com/fnux/ungleich-images/staticcms-ci:latest
+image: code.ungleich.ch:5050/ungleich-public/ungleich-staticcms:latest
 variables:
   BUILDDIR: "build/"
 

Dockerfile

@@ -1,7 +1,14 @@
 # This image used for CI.
 
-FROM debian:latest
-MAINTAINER Timothée Floure <timothee.floure@ungleich.ch>
+FROM alpine:3.15
+MAINTAINER ungleich <foss@ungleich.ch>
+
+RUN pip install lektor
+RUN mkdir /build /data
+COPY . /data
+
+FROM nginx:
 
 RUN apt-get update
-RUN apt-get install -y make lektor imagemagick openssh-client rsync
+RUN apt-get install -y make python3-pip imagemagick openssh-client rsync git
+RUN pip3 install git+https://github.com/lektor/lektor/

Dockerfile.debian

@@ -0,0 +1,8 @@
+# This image used for CI.
+
+FROM debian:latest
+MAINTAINER Timothée Floure <timothee.floure@ungleich.ch>
+
+RUN apt-get update
+RUN apt-get install -y make python3-pip imagemagick openssh-client rsync git
+RUN pip3 install git+https://github.com/lektor/lektor/

Makefile

@@ -1,18 +1,17 @@
 BUILDDIR?=../ungleich-staticcms-build
-BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
+DESTINATION=ungleichstatic@staticweb.ungleich.ch:/home/services/www/ungleichstatic/staticcms.ungleich.ch/www/u/
 
-ifeq ($(BRANCH), "master")
-	DESTINATION=ungleichstatic@staticweb.ungleich.ch:/home/services/www/ungleichstatic/staticcms.ungleich.ch/www/u/
-else
-	DESTINATION=ungleichstatic@staticweb.ungleich.ch:/home/services/www/ungleichstatic/staticcms-staging.ungleich.ch/www/u/
-endif
-
-
-all: publish
+all: goodpush
 
 pull:
 	git pull
 
+push:
+	git push
+
+goodpush:
+	make publish && make push
+
 publish: pull build deploy
 
 deploy: permissions
@@ -23,8 +22,12 @@ permissions: build
 	find $(BUILDDIR) -type f -exec chmod 0644 {} \;
 	find $(BUILDDIR) -type d -exec chmod 0755 {} \;
 
-build:
-	lektor build -O $(BUILDDIR)
+build: venv
+	. ./venv/bin/activate && lektor build -O $(BUILDDIR)
 
 clean:
 	rm -rf $(BUILDDIR)
+
+venv: requirements.txt
+	python3 -m venv venv
+	sh -c ". ./venv/bin/activate && pip install -r requirements.txt"