Compare commits
5 Commits
Author | SHA1 | Date |
---|---|---|
ahmadbilalkhalid | 47f3bbd826 | |
ahmadbilalkhalid | 1e5c56fb31 | |
ahmadbilalkhalid | efc4200a9c | |
ahmadbilalkhalid | 95837d957c | |
ahmadbilalkhalid | 63435ce27d |
|
@ -1,4 +1,3 @@
|
||||||
venv/
|
venv/
|
||||||
.DS_Store
|
.DS_Store
|
||||||
.idea/
|
.idea/
|
||||||
.history
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ stages:
|
||||||
- build
|
- build
|
||||||
- deploy
|
- deploy
|
||||||
|
|
||||||
image: code.ungleich.ch:5050/ungleich-public/ungleich-staticcms:latest
|
image: registry.gitlab.com/fnux/ungleich-images/staticcms-ci:latest
|
||||||
variables:
|
variables:
|
||||||
BUILDDIR: "build/"
|
BUILDDIR: "build/"
|
||||||
|
|
||||||
|
|
13
Dockerfile
|
@ -1,14 +1,7 @@
|
||||||
# This image used for CI.
|
# This image used for CI.
|
||||||
|
|
||||||
FROM alpine:3.15
|
FROM debian:latest
|
||||||
MAINTAINER ungleich <foss@ungleich.ch>
|
MAINTAINER Timothée Floure <timothee.floure@ungleich.ch>
|
||||||
|
|
||||||
RUN pip install lektor
|
|
||||||
RUN mkdir /build /data
|
|
||||||
COPY . /data
|
|
||||||
|
|
||||||
FROM nginx:
|
|
||||||
|
|
||||||
RUN apt-get update
|
RUN apt-get update
|
||||||
RUN apt-get install -y make python3-pip imagemagick openssh-client rsync git
|
RUN apt-get install -y make lektor imagemagick openssh-client rsync
|
||||||
RUN pip3 install git+https://github.com/lektor/lektor/
|
|
||||||
|
|
|
@ -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/
|
|
25
Makefile
|
@ -1,17 +1,18 @@
|
||||||
BUILDDIR?=../ungleich-staticcms-build
|
BUILDDIR?=../ungleich-staticcms-build
|
||||||
DESTINATION=ungleichstatic@staticweb.ungleich.ch:/home/services/www/ungleichstatic/staticcms.ungleich.ch/www/u/
|
BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
|
||||||
|
|
||||||
all: goodpush
|
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
|
||||||
|
|
||||||
pull:
|
pull:
|
||||||
git pull
|
git pull
|
||||||
|
|
||||||
push:
|
|
||||||
git push
|
|
||||||
|
|
||||||
goodpush:
|
|
||||||
make publish && make push
|
|
||||||
|
|
||||||
publish: pull build deploy
|
publish: pull build deploy
|
||||||
|
|
||||||
deploy: permissions
|
deploy: permissions
|
||||||
|
@ -22,12 +23,8 @@ permissions: build
|
||||||
find $(BUILDDIR) -type f -exec chmod 0644 {} \;
|
find $(BUILDDIR) -type f -exec chmod 0644 {} \;
|
||||||
find $(BUILDDIR) -type d -exec chmod 0755 {} \;
|
find $(BUILDDIR) -type d -exec chmod 0755 {} \;
|
||||||
|
|
||||||
build: venv
|
build:
|
||||||
. ./venv/bin/activate && lektor build -O $(BUILDDIR)
|
lektor build -O $(BUILDDIR)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rf $(BUILDDIR)
|
rm -rf $(BUILDDIR)
|
||||||
|
|
||||||
venv: requirements.txt
|
|
||||||
python3 -m venv venv
|
|
||||||
sh -c ". ./venv/bin/activate && pip install -r requirements.txt"
|
|
||||||
|
|
Before Width: | Height: | Size: 17 KiB |
Before Width: | Height: | Size: 258 KiB |
Before Width: | Height: | Size: 22 KiB |
Before Width: | Height: | Size: 48 KiB |
Before Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 44 KiB |
Before Width: | Height: | Size: 44 KiB |
Before Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 42 KiB |
Before Width: | Height: | Size: 50 KiB |
Before Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 50 KiB |
Before Width: | Height: | Size: 49 KiB |
Before Width: | Height: | Size: 36 KiB |
Before Width: | Height: | Size: 63 KiB |
Before Width: | Height: | Size: 44 KiB |
Before Width: | Height: | Size: 58 KiB |
Before Width: | Height: | Size: 58 KiB |
Before Width: | Height: | Size: 52 KiB |
Before Width: | Height: | Size: 36 KiB |
Before Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 34 KiB |
Before Width: | Height: | Size: 41 KiB |
Before Width: | Height: | Size: 29 KiB |
Before Width: | Height: | Size: 42 KiB |
Before Width: | Height: | Size: 41 KiB |
Before Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 109 KiB |
Before Width: | Height: | Size: 291 KiB |
Before Width: | Height: | Size: 78 KiB |
Before Width: | Height: | Size: 65 KiB |
Before Width: | Height: | Size: 135 KiB |
Before Width: | Height: | Size: 144 KiB |
Before Width: | Height: | Size: 81 KiB |
Before Width: | Height: | Size: 232 KiB |
Before Width: | Height: | Size: 237 KiB |
Before Width: | Height: | Size: 302 KiB |
Before Width: | Height: | Size: 98 KiB After Width: | Height: | Size: 105 KiB |
Before Width: | Height: | Size: 62 KiB |
Before Width: | Height: | Size: 115 KiB |
After Width: | Height: | Size: 46 KiB |
Before Width: | Height: | Size: 46 KiB |
Before Width: | Height: | Size: 310 KiB |
Before Width: | Height: | Size: 214 KiB |
Before Width: | Height: | Size: 261 KiB |
Before Width: | Height: | Size: 82 KiB |
Before Width: | Height: | Size: 209 KiB |
Before Width: | Height: | Size: 212 KiB |
Before Width: | Height: | Size: 109 KiB |
Before Width: | Height: | Size: 80 KiB |
Before Width: | Height: | Size: 76 KiB |
Before Width: | Height: | Size: 81 KiB |
Before Width: | Height: | Size: 104 KiB |
Before Width: | Height: | Size: 102 KiB |
Before Width: | Height: | Size: 115 KiB |
Before Width: | Height: | Size: 123 KiB |
Before Width: | Height: | Size: 402 KiB |
Before Width: | Height: | Size: 76 KiB |
Before Width: | Height: | Size: 335 KiB |
Before Width: | Height: | Size: 282 KiB |
Before Width: | Height: | Size: 356 KiB |
Before Width: | Height: | Size: 143 KiB |
Before Width: | Height: | Size: 94 KiB |
Before Width: | Height: | Size: 91 KiB |
Before Width: | Height: | Size: 264 KiB |
Before Width: | Height: | Size: 136 KiB |
Before Width: | Height: | Size: 201 KiB |
Before Width: | Height: | Size: 275 KiB |
Before Width: | Height: | Size: 253 KiB |
Before Width: | Height: | Size: 73 KiB |
Before Width: | Height: | Size: 86 KiB |
Before Width: | Height: | Size: 274 KiB |
Before Width: | Height: | Size: 181 KiB |
Before Width: | Height: | Size: 151 KiB |
Before Width: | Height: | Size: 325 KiB |
Before Width: | Height: | Size: 160 KiB |
Before Width: | Height: | Size: 94 KiB |
Before Width: | Height: | Size: 157 KiB |
Before Width: | Height: | Size: 106 KiB |
Before Width: | Height: | Size: 562 KiB |
Before Width: | Height: | Size: 134 KiB |
Before Width: | Height: | Size: 594 KiB |
Before Width: | Height: | Size: 145 KiB |
Before Width: | Height: | Size: 314 KiB |
Before Width: | Height: | Size: 200 KiB |
Before Width: | Height: | Size: 475 KiB |
Before Width: | Height: | Size: 118 KiB |
Before Width: | Height: | Size: 504 KiB |
Before Width: | Height: | Size: 98 KiB |
Before Width: | Height: | Size: 477 KiB |
Before Width: | Height: | Size: 354 KiB |
Before Width: | Height: | Size: 251 KiB |
Before Width: | Height: | Size: 541 KiB |
Before Width: | Height: | Size: 152 KiB |
Before Width: | Height: | Size: 204 KiB |