initial experimentations

.dockerignore

@@ -1 +0,0 @@
-.git/

.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,10 +0,0 @@
-FROM alpine:3.20
-
-RUN apk add --no-cache make python3 imagemagick
-COPY . /build
-
-WORKDIR /build
-RUN make build
-
-FROM nginx:alpine
-COPY --from=0 /ungleich-staticcms-build /usr/share/nginx/html

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,55 +1,20 @@
-BUILDDIR?=../ungleich-staticcms-build
+BUILDDIR=ungleich-staticcms-build
-DESTINATION=ungleichstatic@staticweb.ungleich.ch:/home/services/www/ungleichstatic/staticcms.ungleich.ch/www/u/
+DESTINATION=ungleichstatic@staticweb.ungleich.ch:/home/services/www/ungleichstatic/staticcms.ungleich.ch/www/
 
-VENV_PATH=../venv
+all: publish
-VERSION=$(shell git describe --always)
-ARGOCD_HOME=$$HOME/vcs/k8s-config/cluster/p10/apps/templates/
-ARGOCD_YAML=staticweb-ungleich.yaml
-ARGOCD_APP=$(ARGOCD_HOME)/$(ARGOCD_YAML)
-
-IMAGE_NAME=harbor.k8s.ungleich.ch/ungleich-public/ungleich-staticcms
-
-# These run outside the container
-all: argocd
-
-argocd: container
-	sed -i "s,$(IMAGE_NAME):.*,$(IMAGE_NAME):$(VERSION)," $(ARGOCD_APP)
-	cd $(ARGOCD_HOME) && git pull && git add $(ARGOCD_YAML) && git commit -m "[staticweb] Update ungleich-staticcms to $(VERSION)" $(ARGOCD_YAML) && git push
-
-container: push
-	docker build -t $(IMAGE_NAME):$(VERSION) .
-	docker push $(IMAGE_NAME):$(VERSION)
-
-justcontainer:
-	docker build -t $(IMAGE_NAME):$(VERSION) .
-
-push: pull
-	git push
 
 pull:
 	git pull
 
-run: justcontainer
+publish: pull build permissions
-	docker run -p 8082:80 $(IMAGE_NAME):$(VERSION)
+	rsync -av --exclude .lektor/ $(BUILDDIR)/ $(DESTINATION)
-
-# These run inside the container
-build: venv
-	. $(VENV_PATH)/bin/activate && lektor build -O $(BUILDDIR)
-
-venv: requirements.txt
-	python3 -m venv $(VENV_PATH)
-	sh -c ". $(VENV_PATH)/bin/activate && pip install -r requirements.txt"
-
-# Pre container targets (kept for reference)
-publish: pull build deploy
-
-deploy: permissions
-	rsync -av --delete --exclude .lektor/ $(BUILDDIR)/u/ $(DESTINATION)
-	rsync -av --delete $(BUILDDIR)/sitemap.xml $(DESTINATION)
 
 permissions: build
 	find $(BUILDDIR) -type f -exec chmod 0644 {} \;
 	find $(BUILDDIR) -type d -exec chmod 0755 {} \;
 
+build:
+	lektor build -O $(BUILDDIR)
+
 clean:
-	rm -rf $(BUILDDIR)
+	rm -rf $(BUILDDIR)