Update Dockerfile

Deleted borg/Dockerfile, borg/Makefile, borg/version, dendrite/Dockerfile, dendrite/Makefile, dendrite/entrypoint.sh, dendrite/version, minio/Dockerfile, minio/Makefile, minio/version, restic/Dockerfile, restic/Makefile, restic/version, watchdog/Dockerfile, watchdog/Makefile, watchdog/version files

.gitlab-ci.yml

@@ -20,31 +20,18 @@ element:
     changes:
       - element/*
 
-minio:
+hugo:
   stage: build
   tags:
    - docker
   script:
-    - cd minio
+    - cd hugo
     - make push
   only:
     variables:
       - $CI_COMMIT_REF_PROTECTED == "true"
     changes:
-      - minio/*
+      - hugo/*
-
-dev-watchdog:
-  stage: build
-  tags:
-   - docker
-  script:
-    - cd watchdog
-    - make nopush
-  only:
-    variables:
-      - $CI_COMMIT_REF_PROTECTED == "false"
-    changes:
-      - watchdog/*
 
 watchdog:
   stage: build
@@ -59,19 +46,6 @@ watchdog:
     changes:
       - watchdog/*
 
-dev-unifi:
-  stage: build
-  tags:
-   - docker
-  script:
-    - cd unifi
-    - make nopush
-  only:
-    variables:
-      - $CI_COMMIT_REF_PROTECTED == "false"
-    changes:
-      - unifi/*
-
 unifi:
   stage: build
   tags:
@@ -85,19 +59,6 @@ unifi:
     changes:
       - unifi/*
 
-dev-keycloak:
-  stage: build
-  tags:
-   - docker
-  script:
-    - cd keycloak
-    - make nopush
-  only:
-    variables:
-      - $CI_COMMIT_REF_PROTECTED == "false"
-    changes:
-      - keycloak/*
-
 keycloak:
   stage: build
   tags:
@@ -111,32 +72,6 @@ keycloak:
     changes:
       - keycloak/*
 
-dev-restic:
-  stage: build
-  tags:
-   - docker
-  script:
-    - cd restic
-    - make nopush
-  only:
-    variables:
-      - $CI_COMMIT_REF_PROTECTED == "false"
-    changes:
-      - restic/*
-
-restic:
-  stage: build
-  tags:
-   - docker
-  script:
-    - cd restic
-    - make push
-  only:
-    variables:
-      - $CI_COMMIT_REF_PROTECTED == "true"
-    changes:
-      - restic/*
-
 pleroma:
   stage: build
   tags:
@@ -150,19 +85,6 @@ pleroma:
     changes:
       - pleroma/*
 
-dendrite:
-  stage: build
-  tags:
-   - docker
-  script:
-    - cd dendrite
-    - make push
-  only:
-    variables:
-      - $CI_COMMIT_REF_PROTECTED == "true"
-    changes:
-      - dendrite/*
-
 roundcubemail:
   stage: build
   tags:
@@ -176,19 +98,6 @@ roundcubemail:
     changes:
       - roundcubemail/*
 
-borg:
-  stage: build
-  tags:
-   - docker
-  script:
-    - cd borg
-    - make push
-  only:
-    variables:
-      - $CI_COMMIT_REF_PROTECTED == "true"
-    changes:
-      - borg/*
-
 shields:
   stage: build
   tags:
@@ -230,8 +139,8 @@ synapse:
   fi
 
   mkdir -p /root/.docker/cli-plugins
-  wget https://github.com/docker/buildx/releases/download/v0.4.2/buildx-v0.4.2.linux-amd64
+  wget https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.linux-amd64
-  mv buildx-v0.4.2.linux-amd64 /root/.docker/cli-plugins/docker-buildx
+  mv buildx-v0.5.1.linux-amd64 /root/.docker/cli-plugins/docker-buildx
   chmod +x /root/.docker/cli-plugins/docker-buildx
   
 before_script:

borg/Dockerfile

@@ -1,19 +0,0 @@
-FROM debian:buster-20210208-slim as builder
-ARG DEBIAN_FRONTEND=noninteractive
-ARG TARGETARCH
-RUN apt update -qq && apt install wget -qqy && rm -rf /var/lib/apt/lists/*
-ARG VERSION
-RUN case $TARGETARCH in \
-      arm) \
-        wget https://dl.bintray.com/borg-binary-builder/borg-binaries/borg-${VERSION}-armv6 -O /usr/bin/borg \
-        ;; \
-      arm64) \
-        wget https://dl.bintray.com/borg-binary-builder/borg-binaries/borg-${VERSION}-arm64 -O /usr/bin/borg \
-        ;; \
-      amd64) \
-        wget https://github.com/borgbackup/borg/releases/download/${VERSION}/borg-linux64 -O /usr/bin/borg \
-        ;; \
-    esac && \
-    chmod a+x /usr/bin/borg 
-FROM debian:buster-20210208-slim
-COPY --from=builder /usr/bin/borg /usr/bin/borg

borg/Makefile

@@ -1,18 +0,0 @@
-NAMESPACE=alemairebe
-include version
-
-IMAGE=borg
-
-nopush:
-	docker buildx build --platform linux/amd64 --load \
-	    --build-arg VERSION=$(VERSION) \
-    	--tag ${NAMESPACE}/${IMAGE}:$(VERSION) \
-		--tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) .
-
-push:
-	docker buildx build --platform linux/amd64,linux/arm64,linux/arm --push \
-	    --build-arg VERSION=$(VERSION) \
-    	--cache-from=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
-	    --cache-to=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
-	    --tag ${NAMESPACE}/${IMAGE}:$(VERSION) \
-		--tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) .

borg/version

@@ -1 +0,0 @@
-VERSION=1.1.15

dendrite/Dockerfile

@@ -1,15 +0,0 @@
-FROM golang:buster as builder
-
-ARG DEBIAN_FRONTEND=noninteractive
-ARG VERSION
-WORKDIR /
-RUN git clone -b v${VERSION} --depth 1 https://github.com/matrix-org/dendrite.git && \
-    cd dendrite && rm -rf .git && ./build.sh
-
-FROM debian:buster-20210208-slim
-
-COPY --from=builder /dendrite/bin/ /usr/local/bin/
-COPY --from=builder /dendrite/dendrite-config.yaml /usr/local/share/
-COPY entrypoint.sh /usr/local/bin/
-
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]

dendrite/Makefile

@@ -1,21 +0,0 @@
-NAMESPACE=alemairebe
-include version
-
-IMAGE=dendrite
-
-nopush:
-	docker buildx build --platform linux/amd64 --load \
-	    --build-arg VERSION=$(VERSION) \
-    	    --tag ${NAMESPACE}/${IMAGE}:$(VERSION) \
-	    --tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) .
-
-push:
-	docker buildx build --platform linux/amd64,linux/arm64 --push \
-	    --build-arg VERSION=$(VERSION) \
-    	    --cache-from=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
-	    --cache-to=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
-	    --tag ${NAMESPACE}/${IMAGE}:$(VERSION) \
-	    --tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) .
-
-git-clone:
-	git clone -b v${VERSION} --depth 1 https://github.com/matrix-org/dendrite.git

dendrite/entrypoint.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-if [ ! -f /usr/local/etc/dendrite.yaml ]; then
-  cp /usr/local/share/dendrite-config.yaml /usr/local/etc/dendrite.yaml
-fi
-
-if [ ! -f /usr/local/etc/matrix_key.pem ]; then
-  /usr/local/bin/generate-keys --private-key /usr/local/etc/matrix_key.pem
-fi
-
-/usr/local/bin/dendrite-monolith-server --config /usr/local/etc/dendrite.yaml
-
-

dendrite/version

@@ -1 +0,0 @@
-VERSION=0.3.8

hugo/Dockerfile

@@ -0,0 +1,13 @@
+ARG DEBIAN_VERSION=20210408
+
+FROM docker.io/debian:bullseye-${DEBIAN_VERSION}-slim as builder
+ARG HUGO_VERSION
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    rsync \
+    openssh-client \
+    wget \
+    ca-certificates \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+COPY hugo.sh /root/hugo.sh
+RUN /bin/sh /root/hugo.sh

hugo/Makefile

@@ -0,0 +1,14 @@
+NAMESPACE=alemairebe
+IMAGE=hugo
+VERSION=0.83.1
+
+push: build
+
+
+build:
+	docker buildx build --platform linux/amd64,linux/arm64,linux/arm --push \
+	  --build-arg HUGO_VERSION=${VERSION} \
+	  --cache-from=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
+	  --cache-to=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
+	  --tag ${NAMESPACE}/${IMAGE}:$(VERSION) \
+	  --tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) .

hugo/hugo.sh

@@ -0,0 +1,49 @@
+#!/bin/sh
+
+# This file is triggered inside the _base/Dockerfile-base file.
+
+set -e
+set -u
+
+# Variables
+# HUGO_VERSION is edited in Dockerfile.
+
+# Architecture
+TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}
+
+if [ "$TARGETPLATFORM" = "linux/amd64" ]; then
+    HUGO_ARCH="64bit"
+elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then
+    HUGO_ARCH="ARM64"
+elif [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then
+    HUGO_ARCH="ARM"
+else
+    echo "Unknown build architecture: $TARGETPLATFORM"
+    exit 2
+fi
+
+# Download binaries from release
+wget https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_VERSION}_Linux-${HUGO_ARCH}.tar.gz
+wget https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_VERSION}_checksums.txt
+
+# Verify checksums
+grep hugo_${HUGO_VERSION}_Linux-${HUGO_ARCH}.tar.gz hugo_${HUGO_VERSION}_checksums.txt | sha256sum -c
+
+# Prepare folders
+mkdir -p /usr/local/bin/
+
+# Unpack downloaded content
+tar -zxf hugo_${HUGO_VERSION}_Linux-${HUGO_ARCH}.tar.gz -C /usr/local/bin
+
+# Verify executable
+/usr/local/bin/hugo version
+
+# Create autocompletion script
+mkdir -p /etc/bash_completion.d
+/usr/local/bin/hugo gen autocomplete > /etc/bash_completion.d/hugo.sh
+
+# Create version file
+echo -n "${HUGO_VERSION}" > /etc/hugo-release
+
+# Remove binaries
+rm hugo_${HUGO_VERSION}_Linux-${HUGO_ARCH}.tar.gz hugo_${HUGO_VERSION}_checksums.txt

minio/Dockerfile

@@ -1,40 +0,0 @@
-FROM golang:1.15-alpine as builder
-
-LABEL maintainer="MinIO Inc <dev@min.io>"
-ARG VERSION
-ARG TARGETARCH
-ENV VERSION $VERSION
-ENV GOPATH /go
-ENV CGO_ENABLED 0
-ENV GO111MODULE on
-
-RUN  \
-     apk add --no-cache git && \
-     git clone -b ${VERSION} --depth 1 https://github.com/minio/minio && cd minio && \
-     go install -v -ldflags "$(go run buildscripts/gen-ldflags.go)"
-
-
-FROM alpine:3.13.0
-
-ENV MINIO_ACCESS_KEY_FILE=access_key \
-    MINIO_SECRET_KEY_FILE=secret_key \
-    MINIO_KMS_MASTER_KEY_FILE=kms_master_key \
-    MINIO_SSE_MASTER_KEY_FILE=sse_master_key \
-    MINIO_UPDATE_MINISIGN_PUBKEY="RWTx5Zr1tiHQLwG9keckT0c45M3AGeHD6IvimQHpyRywVWGbP1aVSGav"
-
-EXPOSE 9000
-
-RUN  \
-     apk add --no-cache ca-certificates 'curl>7.61.0' 'su-exec>=0.2' && \
-     echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf
-
-ARG VERSION
-ENV VERSION $VERSION
-COPY --from=builder /go/bin/minio /usr/bin/minio
-COPY --from=builder /go/minio/dockerscripts/docker-entrypoint.sh /usr/bin/
-
-ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"]
-
-VOLUME ["/data"]
-
-CMD ["minio"]

minio/Makefile

@@ -1,19 +0,0 @@
-NAMESPACE=alemairebe
-include version
-
-IMAGE=minio
-
-nopush:
-	docker buildx build --platform linux/amd64 --load \
-	    --build-arg VERSION=$(VERSION) \
-    	--tag ${NAMESPACE}/${IMAGE}:$(VERSION) \
-		--tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) .
-
-push:
-	docker buildx build --platform linux/amd64,linux/arm64,linux/arm --push \
-	    --build-arg VERSION=$(VERSION) \
-    	--cache-from=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
-	    --cache-to=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
-	    --tag ${NAMESPACE}/${IMAGE}:$(VERSION) \
-		--tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) .
-

minio/version

@@ -1 +0,0 @@
-VERSION=RELEASE.2021-02-07T01-31-02Z

restic/Dockerfile

@@ -1,7 +0,0 @@
-FROM alpine:3.13.0
-ARG VERSION
-ARG TARGETARCH
-ENV VERSION $VERSION
-ADD https://github.com/restic/restic/releases/download/v${VERSION}/restic_${VERSION}_linux_${TARGETARCH}.bz2 /root/restic.bz2
-RUN bunzip2 /root/restic.bz2 && chmod +x /root/restic && mv /root/restic /usr/bin/restic
-ENTRYPOINT ["/usr/bin/restic"]

restic/Makefile

@@ -1,18 +0,0 @@
-NAMESPACE=alemairebe
-include version
-
-IMAGE=restic
-
-nopush:
-	docker buildx build --platform linux/amd64 --load \
-	    --build-arg VERSION=$(VERSION) \
-    	--tag ${NAMESPACE}/${IMAGE}:$(VERSION) \
-		--tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) .
-
-push:
-	docker buildx build --platform linux/amd64,linux/arm64,linux/arm,linux/ppc64le --push \
-	    --build-arg VERSION=$(VERSION) \
-    	--cache-from=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
-	    --cache-to=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
-	    --tag ${NAMESPACE}/${IMAGE}:$(VERSION) \
-		--tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) .

restic/version

@@ -1 +0,0 @@
-VERSION=0.11.0

watchdog/Dockerfile

@@ -1,8 +0,0 @@
-FROM debian:buster-20210408-slim
-ARG DEBIAN_FRONTEND=noninteractive
-ARG VERSION
-RUN apt update -qq && \
-    apt install -qqy --no-install-recommends watchdog=$VERSION && \
-    rm -rf /var/lib/apt/lists/*
-
-ENTRYPOINT ["/usr/sbin/watchdog", "-F"]

watchdog/Makefile

@@ -1,19 +0,0 @@
-NAMESPACE=alemairebe
-include version
-
-IMAGE=watchdog
-
-nopush:
-	docker buildx build --platform linux/amd64 --load \
-	    --build-arg VERSION=$(VERSION) \
-    	--tag ${NAMESPACE}/${IMAGE}:$(VERSION) \
-		--tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) .
-
-push:
-	docker buildx build --platform linux/amd64,linux/arm64,linux/arm,linux/ppc64le --push \
-	    --build-arg VERSION=$(VERSION) \
-    	--cache-from=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
-	    --cache-to=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
-	    --tag ${NAMESPACE}/${IMAGE}:$(VERSION) \
-		--tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) .
-

watchdog/version

@@ -1 +0,0 @@
-VERSION=5.15-2