Fix build

hbstack · Nov 22, 2023 · 1471582 · 1471582
1 parent 25c0462
commit 1471582
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/ci-cd.yaml b/.github/workflows/ci-cd.yaml
@@ -33,6 +33,8 @@ jobs:
           tags: ghcr.io/hbstack/site:latest,ghcr.io/hbstack/site:${{ github.sha }}
           build-args: |
             GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
+            NETRC_USERNAME=${{ secrets.NETRC_GITHUB_USERNAME }}
+            NETRC_PASSWORD=${{ secrets.NETRC_GITHUB_PASSWORD }}
 
       - uses: azure/setup-kubectl@v3
         id: install

diff --git a/.github/workflows/cloudflare-page.yaml b/.github/workflows/cloudflare-page.yaml
@@ -16,11 +16,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
-      - uses: extractions/netrc@v1
-        with:
-          machine: github.com
-          username: ${{ secrets.NETRC_GITHUB_USERNAME }}
-          password: ${{ secrets.NETRC_GITHUB_PASSWORD }}
+      - run: echo "machine github.com\nlogin ${{ secrets.NETRC_GITHUB_USERNAME }}\npassword ${{ secrets.NETRC_GITHUB_PASSWORD }}" > ~/.netrc
 
       # - name: Cache dependencies
       #   uses: actions/cache@v3

diff --git a/Dockerfile b/Dockerfile
@@ -4,6 +4,10 @@
 FROM hugomods/hugo:exts as builder
 ARG GITHUB_TOKEN
 ENV GITHUB_TOKEN=${GITHUB_TOKEN}
+ARG NETRC_USERNAME
+ENV NETRC_USERNAME=${NETRC_USERNAME}
+ARG NETRC_PASSWORD
+ENV NETRC_USERNAME=${NETRC_PASSWORD}
 # Base URL
 ARG HUGO_BASEURL=
 ENV HUGO_BASEURL=${HUGO_BASEURL}
@@ -12,6 +16,7 @@ ARG HUGO_MODULE_PROXY=
 ENV HUGO_MODULE_PROXY=${HUGO_MODULE_PROXY}
 # Build site
 COPY . /src
+RUN echo "machine github.com\nlogin $NETRC_USERNAME\npassword $NETRC_PASSWORD" > ~/.netrc
 RUN hugo --minify --gc --enableGitInfo
 
 ###############