From 3e17e368c80d420ddbf12141c1c5d7e1d99d6ac2 Mon Sep 17 00:00:00 2001 From: aptalca Date: Sat, 4 Feb 2023 14:51:44 -0500 Subject: [PATCH 1/2] rebase to lsio alpine 3.17 to fix builds --- Dockerfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ddcfac5..79664ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,16 @@ # Build container -FROM golang:alpine AS buildstage +FROM ghcr.io/linuxserver/baseimage-alpine:3.17 AS buildstage ARG CLOUDFLARED_TAG RUN mkdir -p /root-layer/cloudflared WORKDIR /src -RUN apk --no-cache add git build-base curl jq +RUN \ + apk add --no-cache \ + build-base \ + git \ + go ENV GO111MODULE=on \ CGO_ENABLED=0 From f008f6cd03535ca85b53743885ba89f29b0264ff Mon Sep 17 00:00:00 2001 From: aptalca Date: Sat, 4 Feb 2023 15:06:08 -0500 Subject: [PATCH 2/2] update checkout action --- .github/workflows/BuildImage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/BuildImage.yml b/.github/workflows/BuildImage.yml index 93a5bf7..86f1e6f 100644 --- a/.github/workflows/BuildImage.yml +++ b/.github/workflows/BuildImage.yml @@ -11,7 +11,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.3 + - uses: actions/checkout@v3.1.0 - name: Build image run: |