Skip to content

Commit af7cf70

Browse files
authored
Merge pull request #574 from linuxserver/universal-cloudflared-rebase
rebase to lsio alpine 3.17 to fix builds
2 parents bcc2883 + f008f6c commit af7cf70

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

.github/workflows/BuildImage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
build:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v2.3.3
14+
- uses: actions/checkout@v3.1.0
1515

1616
- name: Build image
1717
run: |

Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
# Build container
2-
FROM golang:alpine AS buildstage
2+
FROM ghcr.io/linuxserver/baseimage-alpine:3.17 AS buildstage
33

44
ARG CLOUDFLARED_TAG
55

66
RUN mkdir -p /root-layer/cloudflared
77
WORKDIR /src
88

9-
RUN apk --no-cache add git build-base curl jq
9+
RUN \
10+
apk add --no-cache \
11+
build-base \
12+
git \
13+
go
1014

1115
ENV GO111MODULE=on \
1216
CGO_ENABLED=0

0 commit comments

Comments
 (0)