Add environment-to-ini & /usr/local/bin/gitea shim

Fixes #2

Author: watson81

Dockerfile.armv7l

@@ -1,3 +1,26 @@
+#
+# Build environment-to-ini
+#
+FROM golang:1.18-alpine3.15 AS builder
+
+ARG VERSION
+ENV TAGS "bindata timetzdata sqlite sqlite_unlock_notify"
+ENV GOARCH arm
+
+RUN apk --no-cache add build-base git nodejs npm curl
+
+WORKDIR ${GOPATH}/src/code.gitea.io/gitea
+
+## GET GITEA-DOCKER FILES
+RUN curl -fSL  https://github.com/go-gitea/gitea/archive/v$VERSION.tar.gz | \
+    tar xz gitea-$VERSION/ --strip-components=1
+
+# Begin env-to-ini build
+RUN go build contrib/environment-to-ini/environment-to-ini.go
+
+#
+# Build runtime image
+#
 FROM balenalib/armv7hf-alpine:latest
 
 EXPOSE 22 3000
@@ -22,7 +45,8 @@ RUN install_packages \
       curl \
       gettext \
       openssh \
-      tzdata
+      tzdata \
+      gnupg
 
 RUN addgroup \
     -S -g 1000 \
@@ -39,11 +63,16 @@ RUN addgroup \
 ## GITEA RELEASE VERSION
 ARG VERSION=1.15.2
 
+RUN apk upgrade --no-cache
+
+COPY --from=builder /go/src/code.gitea.io/gitea/environment-to-ini /usr/local/bin/environment-to-ini
+
 ## GET GITEA-DOCKER FILES
 RUN curl -fSL  https://github.com/go-gitea/gitea/archive/v$VERSION.tar.gz | \
-    tar xz gitea-$VERSION/docker --exclude=gitea-$VERSION/docker/Makefile --strip-components=3
+    tar xz gitea-$VERSION/docker/root --strip-components=3
 
 ## GET GITEA
 RUN mkdir -p /app/gitea && \
     curl -fSLo /app/gitea/gitea https://github.com/go-gitea/gitea/releases/download/v$VERSION/gitea-$VERSION-linux-arm-6 && \
-    chmod 0755 /app/gitea/gitea
+    chmod 0755 /usr/bin/entrypoint /app/gitea/gitea /usr/local/bin/gitea /usr/local/bin/environment-to-ini && \
+    chmod 0755 /etc/s6/gitea/* /etc/s6/openssh/* /etc/s6/.s6-svscan/*

Dockerfile.x86

@@ -1,3 +1,30 @@
+#
+# Build environment-to-ini
+#
+FROM balenalib/armv7hf-alpine-golang:latest-build AS builder
+
+ARG VERSION
+ENV TAGS "bindata timetzdata sqlite sqlite_unlock_notify"
+ENV GOARCH arm
+
+RUN [ "cross-build-start" ]
+
+RUN apk --no-cache add build-base git nodejs npm curl
+
+WORKDIR ${GOPATH}/src/code.gitea.io/gitea
+
+## GET GITEA-DOCKER FILES
+RUN curl -fSL  https://github.com/go-gitea/gitea/archive/v$VERSION.tar.gz | \
+    tar xz gitea-$VERSION/ --strip-components=1
+
+# Begin env-to-ini build
+RUN go build -ldflags="-extldflags=-static" contrib/environment-to-ini/environment-to-ini.go
+
+RUN [ "cross-build-end" ]
+
+#
+# Build runtime image
+#
 FROM balenalib/armv7hf-alpine:latest
 
 EXPOSE 22 3000
@@ -24,7 +51,8 @@ RUN install_packages \
       curl \
       gettext \
       openssh \
-      tzdata
+      tzdata \
+      gnupg
 
 RUN addgroup \
     -S -g 1000 \
@@ -41,13 +69,18 @@ RUN addgroup \
 ## GITEA RELEASE VERSION
 ARG VERSION=1.15.2
 
+RUN apk upgrade --no-cache
+
+COPY --from=builder /go/src/code.gitea.io/gitea/environment-to-ini /usr/local/bin/environment-to-ini
+
 ## GET GITEA-DOCKER FILES
 RUN curl -fSL  https://github.com/go-gitea/gitea/archive/v$VERSION.tar.gz | \
-    tar xz gitea-$VERSION/docker --exclude=gitea-$VERSION/docker/Makefile --strip-components=3
+    tar xz gitea-$VERSION/docker/root --strip-components=3
 
 ## GET GITEA
 RUN mkdir -p /app/gitea && \
     curl -fSLo /app/gitea/gitea https://github.com/go-gitea/gitea/releases/download/v$VERSION/gitea-$VERSION-linux-arm-6 && \
-    chmod 0755 /app/gitea/gitea
+    chmod 0755 /usr/bin/entrypoint /app/gitea/gitea /usr/local/bin/gitea /usr/local/bin/environment-to-ini && \
+    chmod 0755 /etc/s6/gitea/* /etc/s6/openssh/* /etc/s6/.s6-svscan/*
 
 RUN [ "cross-build-end" ]

build.sh

@@ -15,7 +15,10 @@ if [ "$(docker images -q ${REPO}:${VERSION} 2> /dev/null)" != "" ]; then
   exit 2
 fi
 
-set -x
 docker build --pull --tag "${REPO}:${VERSION}" --build-arg "VERSION=${VERSION}" --file "Dockerfile.$(uname -m)" .
-echo "[INFO] Build Complete. Validate version:"
+
+printf "\n[\e[1;34mINFO\e[0m] Build Complete. \e[1;36mValidate version=%s\e[0m:\n" "${VERSION}"
 docker run --rm "${REPO}:${VERSION}" /app/gitea/gitea --version
+
+printf "\n[\e[1;34mINFO\e[0m] Build Complete. \e[1;36mValidate startup & HTTP Port 9999\e[0m:\n"
+docker run --rm -it -e GITEA__SERVER__HTTP_PORT=9999 "${REPO}:${VERSION}"