Remove job opening

Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>

.dockerignore

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

.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,10 @@
-# This image used for CI.
+FROM alpine:3.20
 
-FROM debian:latest
-MAINTAINER Timothée Floure <timothee.floure@ungleich.ch>
+RUN apk add --no-cache make python3 imagemagick
+COPY . /build
 
-RUN apt-get update
-RUN apt-get install -y make lektor imagemagick openssh-client rsync
+WORKDIR /build
+RUN make build
+
+FROM nginx:alpine
+COPY --from=0 /ungleich-staticcms-build /usr/share/nginx/html

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,11 +1,46 @@
 BUILDDIR?=../ungleich-staticcms-build
 DESTINATION=ungleichstatic@staticweb.ungleich.ch:/home/services/www/ungleichstatic/staticcms.ungleich.ch/www/u/
 
-all: publish
+VENV_PATH=../venv
+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
+	docker run -p 8082:80 $(IMAGE_NAME):$(VERSION)
+
+# 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
@@ -16,8 +51,5 @@ 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)