Forward github action variables to Dockerfile

maxstanley · maxstanley · commit c81639598833 · 2023-11-15T23:37:28.000Z
diff --git a/.github/workflows/release-nightly.yml b/.github/workflows/release-nightly.yml
@@ -64,10 +64,6 @@ jobs:
       # fetch all commits instead of only the last as some branches are long lived and could have many between versions
       # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567
       - run: git fetch --unshallow --quiet --tags --force
-      - uses: actions/setup-go@v4
-        with:
-          go-version-file: go.mod
-          check-latest: true
       - uses: docker/setup-qemu-action@v3
       - uses: docker/setup-buildx-action@v3
       - name: Get cleaned branch name
@@ -80,18 +76,22 @@ jobs:
           fi
           REF_NAME=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\///' -e 's/refs\/tags\///' -e 's/release\/v//')
           echo "branch=${REF_NAME}-nightly" >> "$GITHUB_OUTPUT"
+      - name: Get nightly version
+        run: echo "NIGHTLY_VERSION=$(git describe --tags --always | sed 's/-/+/' | sed 's/^v//')" >> $GITHUB_ENV
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: fetch go modules
-        run: make vendor
       - name: build rootful docker image
         uses: docker/build-push-action@v5
         with:
           context: .
           target: gitea
+          build-args:
+            - GITHUB_REF_NAME=${{ env.GITHUB_REF_NAME }}
+            - GITHUB_REF_TYPE=${{ env.GITHUB_REF_TYPE }}
+            - NIGHTLY_VERSION=${{ env.NIGHTLY_VERSION }}
           platforms: linux/amd64,linux/arm64
           pull: true
           push: true
@@ -101,6 +101,10 @@ jobs:
         with:
           context: .
           target: gitea-rootless
+          build-args:
+            - GITHUB_REF_NAME=${{ env.GITHUB_REF_NAME }}
+            - GITHUB_REF_TYPE=${{ env.GITHUB_REF_TYPE }}
+            - NIGHTLY_VERSION=${{ env.NIGHTLY_VERSION }}
           platforms: linux/amd64,linux/arm64
           pull: true
           push: true
diff --git a/.github/workflows/release-tag-rc.yml b/.github/workflows/release-tag-rc.yml
@@ -61,48 +61,21 @@ jobs:
           gh release create ${{ github.ref_name }} --title ${{ github.ref_name }} --draft --notes-from-tag dist/release/*
         env:
           GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
-  docker-rootful:
+  docker:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      # fetch all commits instead of only the last as some branches are long lived and could have many between versions
-      # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567
-      - run: git fetch --unshallow --quiet --tags --force
       - uses: docker/setup-qemu-action@v3
       - uses: docker/setup-buildx-action@v3
       - uses: docker/metadata-action@v5
-        id: meta
+        id: meta-rootful
         with:
           images: gitea/gitea
           # 1.2.3-rc0
           tags: |
             type=semver,pattern={{version}}
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: build rootful docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          target: gitea
-          platforms: linux/amd64,linux/arm64
-          pull: true
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-  docker-rootless:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      # fetch all commits instead of only the last as some branches are long lived and could have many between versions
-      # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567
-      - run: git fetch --unshallow --quiet --tags --force
-      - uses: docker/setup-qemu-action@v3
-      - uses: docker/setup-buildx-action@v3
       - uses: docker/metadata-action@v5
-        id: meta
+        id: meta-rootless
         with:
           images: gitea/gitea
           # each tag below will have the suffix of -rootless
@@ -116,13 +89,29 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: build rootful docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          target: gitea
+          build-args:
+            - GITHUB_REF_NAME=${{ env.GITHUB_REF_NAME }}
+            - GITHUB_REF_TYPE=${{ env.GITHUB_REF_TYPE }}
+          platforms: linux/amd64,linux/arm64
+          pull: true
+          push: true
+          tags: ${{ steps.meta-rootful.outputs.tags }}
+          labels: ${{ steps.meta-rootful.outputs.labels }}
       - name: build rootless docker image
         uses: docker/build-push-action@v5
         with:
           context: .
           target: gitea-rootless
+          build-args:
+            - GITHUB_REF_NAME=${{ env.GITHUB_REF_NAME }}
+            - GITHUB_REF_TYPE=${{ env.GITHUB_REF_TYPE }}
           platforms: linux/amd64,linux/arm64
           pull: true
           push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          tags: ${{ steps.meta-rootless.outputs.tags }}
+          labels: ${{ steps.meta-rootless.outputs.labels }}
diff --git a/.github/workflows/release-tag-version.yml b/.github/workflows/release-tag-version.yml
@@ -63,17 +63,13 @@ jobs:
           gh release create ${{ github.ref_name }} --title ${{ github.ref_name }} --draft --notes-from-tag dist/release/*
         env:
           GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
-  docker-rootful:
+  docker:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      # fetch all commits instead of only the last as some branches are long lived and could have many between versions
-      # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567
-      - run: git fetch --unshallow --quiet --tags --force
-      - uses: docker/setup-qemu-action@v3
       - uses: docker/setup-buildx-action@v3
       - uses: docker/metadata-action@v5
-        id: meta
+        id: meta-rootful
         with:
           images: gitea/gitea
           # this will generate tags in the following format:
@@ -86,32 +82,8 @@ jobs:
             type=semver,pattern={{major}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{version}}
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: build rootful docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          target: gitea
-          platforms: linux/amd64,linux/arm64
-          pull: true
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-  docker-rootless:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      # fetch all commits instead of only the last as some branches are long lived and could have many between versions
-      # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567
-      - run: git fetch --unshallow --quiet --tags --force
-      - uses: docker/setup-qemu-action@v3
-      - uses: docker/setup-buildx-action@v3
       - uses: docker/metadata-action@v5
-        id: meta
+        id: meta-rootless
         with:
           images: gitea/gitea
           # each tag below will have the suffix of -rootless
@@ -132,13 +104,29 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: build rootful docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          target: gitea
+          build-args:
+            - GITHUB_REF_NAME=${{ env.GITHUB_REF_NAME }}
+            - GITHUB_REF_TYPE=${{ env.GITHUB_REF_TYPE }}
+          platforms: linux/amd64,linux/arm64
+          pull: true
+          push: true
+          tags: ${{ steps.meta-rootful.outputs.tags }}
+          labels: ${{ steps.meta-rootful.outputs.labels }}
       - name: build rootless docker image
         uses: docker/build-push-action@v5
         with:
           context: .
           target: gitea-rootless
+          build-args:
+            - GITHUB_REF_NAME=${{ env.GITHUB_REF_NAME }}
+            - GITHUB_REF_TYPE=${{ env.GITHUB_REF_TYPE }}
           platforms: linux/amd64,linux/arm64
           pull: true
           push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          tags: ${{ steps.meta-rootless.outputs.tags }}
+          labels: ${{ steps.meta-rootless.outputs.labels }}
diff --git a/Dockerfile b/Dockerfile
@@ -1,12 +1,16 @@
 # Build stage
 FROM docker.io/library/node:20-alpine3.18 AS build-frontend
 
-ARG GITEA_VERSION
+ARG GITHUB_REF_NAME
+ARG GITHUB_REF_TYPE
+ARG NIGHTLY_VERSION
+
+ENV GITHUB_REF_NAME=${GITHUB_REF_NAME:-docker-develop}
+ENV GITHUB_REF_TYPE=${GITHUB_REF_TYPE:-branch}
+ENV NIGHTLY_VERSION=${NIGHTLY_VERSION}
 
 # Build deps
-RUN apk --no-cache add \
-    build-base \
-    git \
+RUN apk --no-cache add build-base git \
     && rm -rf /var/cache/apk/*
 
 # Setup repo
@@ -26,28 +30,29 @@ COPY ./assets ./assets
 COPY ./public ./public
 COPY ./web_src ./web_src
 
-# Checkout version if set
-COPY ./.git ./.git
-RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi
-
 # Build frontend
 RUN make clean-all frontend
 
 # Build stage
 FROM docker.io/library/golang:1.21-alpine3.18 AS build-backend
 
+ARG GITHUB_REF_NAME
+ARG GITHUB_REF_TYPE
+ARG NIGHTLY_VERSION
+
+ENV GITHUB_REF_NAME=${GITHUB_REF_NAME:-docker-develop}
+ENV GITHUB_REF_TYPE=${GITHUB_REF_TYPE:-branch}
+ENV NIGHTLY_VERSION=${NIGHTLY_VERSION}
+
 ARG GOPROXY
 ENV GOPROXY ${GOPROXY:-direct}
 
-ARG GITEA_VERSION
 ARG TAGS="sqlite sqlite_unlock_notify"
 ENV TAGS "bindata timetzdata $TAGS"
 ARG CGO_EXTRA_CFLAGS
 
 # Build deps
-RUN apk --no-cache add \
-    build-base \
-    git \
+RUN apk --no-cache add build-base git \
     && rm -rf /var/cache/apk/*
 
 # Setup repo
@@ -73,10 +78,6 @@ COPY ./templates ./templates
 COPY ./build.go .
 COPY ./main.go .
 
-# Checkout version if set
-COPY ./.git ./.git
-RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi
-
 # Clean directory
 RUN make clean-all
 
diff --git a/Makefile b/Makefile
@@ -96,6 +96,10 @@ else
 		VERSION ?= main
 	endif
 
+	ifneq ($(NIGTLY_VERSION),)
+		GITEA_VERSION ?= $(NIGTLY_VERSION)
+	endif
+
 	STORED_VERSION=$(shell cat $(STORED_VERSION_FILE) 2>/dev/null)
 	ifneq ($(STORED_VERSION),)
 		GITEA_VERSION ?= $(STORED_VERSION)
@@ -975,8 +979,8 @@ generate-manpage:
 
 .PHONY: docker
 docker:
-	docker build --disable-content-trust=false -t $(DOCKER_REF) .
-# support also build args docker build --build-arg GITEA_VERSION=v1.2.3 --build-arg TAGS="bindata sqlite sqlite_unlock_notify"  .
+	docker build --disable-content-trust=false -t $(DOCKER_REF) --taget gitea .
+# support also build args docker build --build-arg TAGS="bindata sqlite sqlite_unlock_notify" --target gitea .
 
 # This endif closes the if at the top of the file
 endif
