Maint: rename Docker build arguments

3 years ago · 9698606fe6
parent 0caae36787
commit 9698606fe6
3 changed files with 68 additions and 68 deletions
--- a/.github/workflows/buildx-latest.yml
+++ b/.github/workflows/buildx-latest.yml
@ -26,8 +26,8 @@ jobs:
          docker buildx build \
            --progress plain \
            --platform=linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6 \
-            --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
-            --build-arg VCS_REF=`git rev-parse --short HEAD` \
+            --build-arg CREATED=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+            --build-arg COMMIT=`git rev-parse --short HEAD` \
            --build-arg VERSION=latest \
            -t qmcgaw/stackedit:latest \
            --push \
--- a/.github/workflows/buildx-release.yml
+++ b/.github/workflows/buildx-release.yml
@ -26,8 +26,8 @@ jobs:
          docker buildx build \
            --progress plain \
            --platform=linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6 \
-            --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
-            --build-arg VCS_REF=`git rev-parse --short HEAD` \
+            --build-arg CREATED=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+            --build-arg COMMIT=`git rev-parse --short HEAD` \
            --build-arg VERSION=${GITHUB_REF##*/} \
            -t qmcgaw/stackedit:${GITHUB_REF##*/} \
            --push \
--- a/128
+++ b/128
@ -1,64 +1,64 @@
-ARG ALPINE_VERSION=3.12
-ARG GO_VERSION=1.14
-ARG STACKEDIT_VERSION=v5.14.5
-
-FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS server
-RUN apk --update add git
-ENV CGO_ENABLED=0
-RUN wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s ${GOLANGCI_LINT_VERSION}
-WORKDIR /tmp/gobuild
-COPY .golangci.yml .
-COPY go.mod go.sum ./
-RUN go mod download 2>&1
-COPY main.go ./
-#RUN go test -v -race ./...
-RUN golangci-lint run --timeout=10m
-RUN go build -ldflags="-s -w" -o app main.go
-
-FROM --platform=amd64 alpine:${ALPINE_VERSION} AS stackedit
-ARG STACKEDIT_VERSION
-WORKDIR /stackedit
-RUN apk add -q --progress --update --no-cache git npm
-RUN git clone --branch ${STACKEDIT_VERSION} --single-branch --depth 1 https://github.com/benweet/stackedit.git . &> /dev/null
-RUN npm install --only=prod
-RUN npm audit fix
-ENV NODE_ENV=production
-RUN sed -i "s/assetsPublicPath: '\/',/assetsPublicPath: '.\/',/g" config/index.js
-RUN npm run build
-
-FROM scratch AS final
-ARG BUILD_DATE
-ARG VCS_REF
-ARG STACKEDIT_VERSION
-LABEL \
-    org.opencontainers.image.authors="quentin.mcgaw@gmail.com" \
-    org.opencontainers.image.created=$BUILD_DATE \
-    org.opencontainers.image.version=$STACKEDIT_VERSION \
-    org.opencontainers.image.revision=$VCS_REF \
-    org.opencontainers.image.url="https://github.com/qdm12/stackedit-docker" \
-    org.opencontainers.image.documentation="https://github.com/qdm12/stackedit-docker/blob/master/README.md" \
-    org.opencontainers.image.source="https://github.com/qdm12/stackedit-docker" \
-    org.opencontainers.image.title="stackedit-docker" \
-    org.opencontainers.image.description="StackEdit server in a lightweight Docker container"
-EXPOSE 8000
-HEALTHCHECK --start-period=1s --interval=100s --timeout=2s --retries=1 CMD ["/server","healthcheck"]
-USER 1000
-ENTRYPOINT ["/server"]
-ENV \
-    LISTENING_PORT=8000 \
-    ROOT_URL=/ \
-    NODE_ENV=production \
-    PANDOC_PATH=pandoc \
-    WKHTMLTOPDF_PATH=wkhtmltopdf \
-    USER_BUCKET_NAME=stackedit-users \
-    PAYPAL_RECEIVER_EMAIL= \
-    DROPBOX_APP_KEY= \
-    DROPBOX_APP_KEY_FULL= \
-    GITHUB_CLIENT_ID= \
-    GITHUB_CLIENT_SECRET= \
-    GOOGLE_CLIENT_ID= \
-    GOOGLE_API_KEY= \
-    WORDPRESS_CLIENT_ID=
-COPY --from=stackedit --chown=1000 /stackedit/dist   /html/dist
-COPY --from=stackedit --chown=1000 /stackedit/static /html/static
-COPY --from=server --chown=1000 /tmp/gobuild/app /server
+ARG ALPINE_VERSION=3.12
+ARG GO_VERSION=1.14
+ARG STACKEDIT_VERSION=v5.14.5
+
+FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS server
+RUN apk --update add git
+ENV CGO_ENABLED=0
+RUN wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s ${GOLANGCI_LINT_VERSION}
+WORKDIR /tmp/gobuild
+COPY .golangci.yml .
+COPY go.mod go.sum ./
+RUN go mod download 2>&1
+COPY main.go ./
+#RUN go test -v -race ./...
+RUN golangci-lint run --timeout=10m
+RUN go build -ldflags="-s -w" -o app main.go
+
+FROM --platform=amd64 alpine:${ALPINE_VERSION} AS stackedit
+ARG STACKEDIT_VERSION
+WORKDIR /stackedit
+RUN apk add -q --progress --update --no-cache git npm
+RUN git clone --branch ${STACKEDIT_VERSION} --single-branch --depth 1 https://github.com/benweet/stackedit.git . &> /dev/null
+RUN npm install --only=prod
+RUN npm audit fix
+ENV NODE_ENV=production
+RUN sed -i "s/assetsPublicPath: '\/',/assetsPublicPath: '.\/',/g" config/index.js
+RUN npm run build
+
+FROM scratch AS final
+ARG CREATED
+ARG COMMIT
+ARG STACKEDIT_VERSION
+LABEL \
+    org.opencontainers.image.authors="quentin.mcgaw@gmail.com" \
+    org.opencontainers.image.created=$CREATED \
+    org.opencontainers.image.version=$STACKEDIT_VERSION \
+    org.opencontainers.image.revision=$COMMIT \
+    org.opencontainers.image.url="https://github.com/qdm12/stackedit-docker" \
+    org.opencontainers.image.documentation="https://github.com/qdm12/stackedit-docker/blob/master/README.md" \
+    org.opencontainers.image.source="https://github.com/qdm12/stackedit-docker" \
+    org.opencontainers.image.title="stackedit-docker" \
+    org.opencontainers.image.description="StackEdit server in a lightweight Docker container"
+EXPOSE 8000
+HEALTHCHECK --start-period=1s --interval=100s --timeout=2s --retries=1 CMD ["/server","healthcheck"]
+USER 1000
+ENTRYPOINT ["/server"]
+ENV \
+    LISTENING_PORT=8000 \
+    ROOT_URL=/ \
+    NODE_ENV=production \
+    PANDOC_PATH=pandoc \
+    WKHTMLTOPDF_PATH=wkhtmltopdf \
+    USER_BUCKET_NAME=stackedit-users \
+    PAYPAL_RECEIVER_EMAIL= \
+    DROPBOX_APP_KEY= \
+    DROPBOX_APP_KEY_FULL= \
+    GITHUB_CLIENT_ID= \
+    GITHUB_CLIENT_SECRET= \
+    GOOGLE_CLIENT_ID= \
+    GOOGLE_API_KEY= \
+    WORDPRESS_CLIENT_ID=
+COPY --from=stackedit --chown=1000 /stackedit/dist   /html/dist
+COPY --from=stackedit --chown=1000 /stackedit/static /html/static
+COPY --from=server --chown=1000 /tmp/gobuild/app /server