mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-11-25 11:21:02 +00:00
Code Issues Projects Releases Wiki Activity

Improved Local backend detection (#4006)

Browse source 
Co-authored-by: 6543 <6543@obermui.de>
This commit is contained in:
Thomas Anderson 2024-08-07 13:04:10 +03:00 committed by GitHub
parent 2081ca85db
commit 6c9469f610
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docker/Dockerfile.agent.alpine.multiarch
View file

@ -10,6 +10,8 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
FROM docker.io/alpine:3.20 FROM docker.io/alpine:3.20
RUN apk add -U --no-cache ca-certificates RUN apk add -U --no-cache ca-certificates
ENV GODEBUG=netdns=go ENV GODEBUG=netdns=go
# Internal setting do NOT change! Signals that woodpecker is running inside a container
ENV WOODPECKER_IN_CONTAINER=true
EXPOSE 3000 EXPOSE 3000
COPY --from=build /src/dist/woodpecker-agent /bin/ COPY --from=build /src/dist/woodpecker-agent /bin/

2
docker/Dockerfile.agent.multiarch
View file

@ -10,6 +10,8 @@ RUN mkdir -p /etc/woodpecker
FROM scratch FROM scratch
ENV GODEBUG=netdns=go ENV GODEBUG=netdns=go
# Internal setting do NOT change! Signals that woodpecker is running inside a container
ENV WOODPECKER_IN_CONTAINER=true
EXPOSE 3000 EXPOSE 3000
# copy certs from build image # copy certs from build image

5
pipeline/backend/local/local.go
View file

@ -63,7 +63,10 @@ func (e *local) Name() string {
} }
func (e *local) IsAvailable(context.Context) bool { func (e *local) IsAvailable(context.Context) bool {
return true _, inContainer := os.LookupEnv("WOODPECKER_IN_CONTAINER")
// note: we don't need to check by args as this would indicate we are not in an container anyway ...
backend := os.Getenv("WOODPECKER_BACKEND")
return backend == "local" || !inContainer
} }
func (e *local) Flags() []cli.Flag { func (e *local) Flags() []cli.Flag {