many changes

main
Ricard Illa 2022-03-07 13:55:05 +01:00
parent 1d74fd2e41
commit baa0b7ac11
19 changed files with 113 additions and 56 deletions

View File

@ -1,10 +1,15 @@
USERNAME = rilla
IMG_NAME = backup IMG_NAME = backup
REGISTRY=registry.monotremata.xyz:443
.PHONY: build build-nc IMG=$(REGISTRY)/$(IMG_NAME)
.PHONY: build build-nc tag push
build: Dockerfile make_backup.sh build: Dockerfile make_backup.sh
docker build -t $(USERNAME)/$(IMG_NAME) . docker build -t $(IMG) .
build-nc: Dockerfile make_backup.sh push: build
docker build --no-cache -t $(USERNAME)/$(IMG_NAME) . docker image push $(IMG)
build-nc: Dockerfile docker-entrypoint.sh sshd_config
docker build --no-cache -t $(IMG)

View File

@ -1,4 +1,4 @@
FROM alpine:3.12 FROM alpine:3.14
RUN apk add --update --no-cache \ RUN apk add --update --no-cache \
docker-compose \ docker-compose \

View File

@ -1,10 +1,14 @@
USERNAME = rilla
IMG_NAME = gitolite IMG_NAME = gitolite
REGISTRY=registry.monotremata.xyz:443
IMG=$(REGISTRY)/$(IMG_NAME)
.PHONY: build build-nc .PHONY: build build-nc push
build: Dockerfile docker-entrypoint.sh sshd_config build: Dockerfile docker-entrypoint.sh sshd_config
docker build -t $(USERNAME)/$(IMG_NAME) . docker build -t $(IMG) .
push: build
docker image push $(IMG)
build-nc: Dockerfile docker-entrypoint.sh sshd_config build-nc: Dockerfile docker-entrypoint.sh sshd_config
docker build --no-cache -t $(USERNAME)/$(IMG_NAME) . docker build --no-cache -t $(IMG) .

View File

@ -1,7 +1,7 @@
FROM debian:buster-slim FROM debian:bullseye-slim
ARG ARCH ARG ARCH
ENV VER v0.17.2.0 ENV VER v0.17.2.3
ENV URL "https://downloads.getmonero.org/cli/monero-linux-${ARCH}-${VER}.tar.bz2" ENV URL "https://downloads.getmonero.org/cli/monero-linux-${ARCH}-${VER}.tar.bz2"
RUN apt-get update && \ RUN apt-get update && \

View File

@ -1,7 +1,8 @@
USERNAME = rilla
IMG_NAME = monero IMG_NAME = monero
REGISTRY=registry.monotremata.xyz:443
IMG=$(REGISTRY)/$(IMG_NAME)
.PHONY: build build-nc .PHONY: build build-nc push
hw=$(shell uname -m) hw=$(shell uname -m)
ifeq ($(hw), x86_64) ifeq ($(hw), x86_64)
@ -13,7 +14,10 @@ else
endif endif
build: Dockerfile build: Dockerfile
docker build -t $(USERNAME)/$(IMG_NAME) --build-arg ARCH=$(ARCH) . docker build -t $(IMG) --build-arg ARCH=$(ARCH) .
push: build
docker image push $(IMG)
build-nc: Dockerfile build-nc: Dockerfile
docker build --no-cache -t $(USERNAME)/$(IMG_NAME) --build-arg ARCH=$(ARCH) . docker build --no-cache -t $(IMG) --build-arg ARCH=$(ARCH) .

View File

@ -1,4 +1,4 @@
FROM alpine:3.13 FROM alpine:3.14
RUN apk add --no-cache \ RUN apk add --no-cache \
nginx \ nginx \

View File

@ -1,10 +1,15 @@
USERNAME = rilla
IMG_NAME = rainloop IMG_NAME = rainloop
REGISTRY=registry.monotremata.xyz:443
.PHONY: build build-nc IMG=$(REGISTRY)/$(IMG_NAME)
.PHONY: build build-nc push
build: Dockerfile build: Dockerfile
docker build -t $(USERNAME)/$(IMG_NAME) . docker build -t $(IMG) .
push: build
docker image push $(IMG)
build-nc: Dockerfile build-nc: Dockerfile
docker build --no-cache -t $(USERNAME)/$(IMG_NAME) . docker build --no-cache -t $(IMG) .

View File

@ -1,4 +1,4 @@
FROM alpine:3.13 FROM alpine:3.14
RUN apk add --no-cache \ RUN apk add --no-cache \
git su-exec nginx php7 php7-fpm \ git su-exec nginx php7 php7-fpm \

View File

@ -1,10 +1,15 @@
USERNAME = rilla
IMG_NAME = rss-bridge IMG_NAME = rss-bridge
REGISTRY=registry.monotremata.xyz:443
.PHONY: build build-nc IMG=$(REGISTRY)/$(IMG_NAME)
.PHONY: build build-nc push
build: Dockerfile build: Dockerfile
docker build -t $(USERNAME)/$(IMG_NAME) . docker build -t $(IMG) .
push: build
docker image push $(IMG)
build-nc: Dockerfile build-nc: Dockerfile
docker build --no-cache -t $(USERNAME)/$(IMG_NAME) . docker build --no-cache -t $(IMG) .

View File

@ -1,9 +1,9 @@
# syncthing # syncthing
FROM alpine:3.13 FROM alpine:3.14
ARG ARCH ARG ARCH
ENV VER v1.18.1 ENV VER v1.18.3
ENV REL syncthing-linux-${ARCH}-${VER} ENV REL syncthing-linux-${ARCH}-${VER}
ENV URI https://github.com/syncthing/syncthing/releases/download/${VER}/${REL}.tar.gz ENV URI https://github.com/syncthing/syncthing/releases/download/${VER}/${REL}.tar.gz

View File

@ -1,7 +1,9 @@
USERNAME = rilla
IMG_NAME = syncthing IMG_NAME = syncthing
REGISTRY=registry.monotremata.xyz:443
.PHONY: build build-nc IMG=$(REGISTRY)/$(IMG_NAME)
.PHONY: build build-nc push
hw=$(shell uname -m) hw=$(shell uname -m)
ifeq ($(hw), x86_64) ifeq ($(hw), x86_64)
@ -13,7 +15,10 @@ else
endif endif
build: Dockerfile docker-entrypoint.sh build: Dockerfile docker-entrypoint.sh
docker build -t $(USERNAME)/$(IMG_NAME) --build-arg ARCH=$(ARCH) . docker build -t $(IMG) --build-arg ARCH=$(ARCH) .
push: build
docker image push $(IMG)
build-nc: Dockerfile docker-entrypoint.sh build-nc: Dockerfile docker-entrypoint.sh
docker build --no-cache -t $(USERNAME)/$(IMG_NAME) --build-arg ARCH=$(ARCH) . docker build --no-cache -t $(IMG) --build-arg ARCH=$(ARCH) .

View File

@ -1,4 +1,4 @@
FROM alpine:3.12 FROM alpine:3.14
RUN apk add --update --no-cache \ RUN apk add --update --no-cache \
docker-compose \ docker-compose \

View File

@ -1,10 +1,15 @@
USERNAME = rilla
IMG_NAME = tasks IMG_NAME = tasks
REGISTRY=registry.monotremata.xyz:443
.PHONY: build build-nc IMG=$(REGISTRY)/$(IMG_NAME)
.PHONY: build build-nc push
build: Dockerfile entrypoint.sh build: Dockerfile entrypoint.sh
docker build -t $(USERNAME)/$(IMG_NAME) . docker build -t $(IMG) .
push: build
docker image push $(IMG)
build-nc: Dockerfile entrypoint.sh build-nc: Dockerfile entrypoint.sh
docker build --no-cache -t $(USERNAME)/$(IMG_NAME) . docker build --no-cache -t $(IMG)

View File

@ -1,7 +1,9 @@
FROM alpine:3.13 FROM alpine:3.14
ENV VER 3.00
RUN apk add --no-cache --virtual .build-deps \ RUN apk add --no-cache --virtual .build-deps \
git \ curl \
cmake \ cmake \
make \ make \
gcc \ gcc \
@ -12,8 +14,10 @@ RUN apk add --no-cache --virtual .build-deps \
autoconf \ autoconf \
libtool && \ libtool && \
mkdir -p /usr/local/src && \ mkdir -p /usr/local/src && \
git clone https://github.com/transmission/transmission /usr/local/src/transmission && \ curl -L \
git -C /usr/local/src/transmission submodule update --init && \ --output "/usr/local/src/transmission-${VER}.tar.xz" \
"https://github.com/transmission/transmission-releases/raw/master/transmission-${VER}.tar.xz" && \
tar -xf "/usr/local/src/tranmission-${VER}.tar.xz" -C /usr/local/src && \
mkdir -p /usr/local/src/transmission/build && \ mkdir -p /usr/local/src/transmission/build && \
cd /usr/local/src/transmission/build && \ cd /usr/local/src/transmission/build && \
cmake .. && \ cmake .. && \

View File

@ -1,10 +1,14 @@
USERNAME = rilla
IMG_NAME = transmission IMG_NAME = transmission
REGISTRY=registry.monotremata.xyz:443
IMG=$(REGISTRY)/$(IMG_NAME)
.PHONY: build build-nc .PHONY: build build-nc push
build: Dockerfile build: Dockerfile
docker build -t $(USERNAME)/$(IMG_NAME) . docker build -t $(IMG) .
push: build
docker image push $(IMG)
build-nc: Dockerfile build-nc: Dockerfile
docker build --no-cache -t $(USERNAME)/$(IMG_NAME) . docker build --no-cache -t $(IMG) .

View File

@ -1,4 +1,4 @@
FROM alpine:3.13 FROM alpine:3.14
RUN apk add --no-cache python3 py3-pip su-exec && \ RUN apk add --no-cache python3 py3-pip su-exec && \
pip3 install --upgrade pip && \ pip3 install --upgrade pip && \

View File

@ -1,10 +1,20 @@
USERNAME = rilla
IMG_NAME = vdirsyncer IMG_NAME = vdirsyncer
USERNAME = rilla
REGISTRY=registry.monotremata.xyz:443
.PHONY: build build-nc LOCAL_IMG=$(USERNAME)/$(IMG_NAME)
REGISTRY_IMG=$(REGISTRY)/$(IMG_NAME)
.PHONY: build build-nc tag push
build: Dockerfile entrypoint.sh crontab do_sync.sh build: Dockerfile entrypoint.sh crontab do_sync.sh
docker build -t $(USERNAME)/$(IMG_NAME) . docker build -t $(USERNAME)/$(IMG_NAME) .
tag: build
docker image tag $(LOCAL_IMG) $(REGISTRY_IMG)
push: tag
docker image push $(REGISTRY_IMG)
build-nc: Dockerfile entrypoint.sh crontab do_sync.sh build-nc: Dockerfile entrypoint.sh crontab do_sync.sh
docker build --no-cache -t $(USERNAME)/$(IMG_NAME) . docker build --no-cache -t $(USERNAME)/$(IMG_NAME) .

View File

@ -1,4 +1,4 @@
FROM alpine:3.11 FROM alpine:3.14
RUN apk add --no-cache \ RUN apk add --no-cache \
git \ git \
@ -12,12 +12,13 @@ RUN apk add --no-cache \
pip3 install --upgrade pip && \ pip3 install --upgrade pip && \
pip3 install \ pip3 install \
aiohttp \ aiohttp \
defusedxml \
dulwich \
icalendar \ icalendar \
dulwich>=0.19.1 \
defusedxml \
jinja2 \ jinja2 \
multidict \
prometheus-client && \ prometheus-client && \
apk del .build-deps && \ # apk del .build-deps && \
mkdir -p /opt && \ mkdir -p /opt && \
git clone https://github.com/jelmer/xandikos /opt/xandikos && \ git clone https://github.com/jelmer/xandikos /opt/xandikos && \
adduser -D -h /var/lib/xandikos xandikos && \ adduser -D -h /var/lib/xandikos xandikos && \

View File

@ -1,10 +1,15 @@
USERNAME = rilla
IMG_NAME = xandikos IMG_NAME = xandikos
REGISTRY=registry.monotremata.xyz:443
.PHONY: build build-nc IMG=$(REGISTRY)/$(IMG_NAME)
.PHONY: build build-nc push
build: Dockerfile entrypoint.sh build: Dockerfile entrypoint.sh
docker build -t $(USERNAME)/$(IMG_NAME) . docker build -t $(IMG) .
push: build
docker image push $(IMG)
build-nc: Dockerfile entrypoint.sh build-nc: Dockerfile entrypoint.sh
docker build --no-cache -t $(USERNAME)/$(IMG_NAME) . docker build --no-cache -t $(IMG) .