initial experimentations

.gitignore

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

.gitlab-ci.yml

@@ -1,33 +0,0 @@
-stages:
-  - build
-  - deploy
-
-image: code.ungleich.ch:5050/ungleich-public/ungleich-staticcms:latest
-variables:
-  BUILDDIR: "build/"
-
-build:
-  stage: build
-  script:
-    - make build
-  artifacts:
-    expire_in: 12 hours
-    paths:
-      - "build/"
-
-deploy:
-  stage: deploy
-  only:
-    - master
-  environment:
-    name: production
-    url: https://ungleich.ch/
-  before_script:
-    # Configure the SSH Agent
-    - eval $(ssh-agent -s)
-    - echo "$CD_SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
-    - mkdir -p ~/.ssh
-    - echo "$CD_SSH_SERVER_HOSTKEYS" > ~/.ssh/known_hosts
-    - chmod 644 ~/.ssh/known_hosts
-  script:
-    - make deploy

Dockerfile

@@ -1,14 +0,0 @@
-# This image used for CI.
-
-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 python3-pip imagemagick openssh-client rsync git
-RUN pip3 install git+https://github.com/lektor/lektor/

Dockerfile.debian

@@ -1,8 +0,0 @@
-# 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,33 +1,20 @@
-BUILDDIR?=../ungleich-staticcms-build
-DESTINATION=ungleichstatic@staticweb.ungleich.ch:/home/services/www/ungleichstatic/staticcms.ungleich.ch/www/u/
+BUILDDIR=ungleich-staticcms-build
+DESTINATION=ungleichstatic@staticweb.ungleich.ch:/home/services/www/ungleichstatic/staticcms.ungleich.ch/www/
 
-all: goodpush
+all: publish
 
 pull:
 	git pull
 
-push:
-	git push
-
-goodpush:
-	make publish && make push
-
-publish: pull build deploy
-
-deploy: permissions
-	rsync -av --delete --exclude .lektor/ $(BUILDDIR)/u/ $(DESTINATION)
-	rsync -av --delete $(BUILDDIR)/sitemap.xml $(DESTINATION)
+publish: pull build permissions
+	rsync -av --exclude .lektor/ $(BUILDDIR)/ $(DESTINATION)
 
 permissions: build
 	find $(BUILDDIR) -type f -exec chmod 0644 {} \;
 	find $(BUILDDIR) -type d -exec chmod 0755 {} \;
 
-build: venv
-	. ./venv/bin/activate && lektor build -O $(BUILDDIR)
+build:
+	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"
+	rm -rf $(BUILDDIR)