Skip to content

Commit d0b3c40

Browse files
authored
Merge pull request #120 from pi-hole/update/ftl-build
Update dependency versions in ftl-build container
2 parents f236681 + 6ef7456 commit d0b3c40

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

.github/workflows/ftl-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108
context: ftl-build
109109
platforms: ${{ matrix.platform }}
110110
push: false
111-
target: tester
111+
target: test
112112
tags: ${{ steps.meta.outputs.tags }}
113113
labels: ${{ steps.meta.outputs.labels }}
114114
-
@@ -120,7 +120,7 @@ jobs:
120120
context: ftl-build
121121
platforms: ${{ matrix.platform }}
122122
push: ${{ github.event_name != 'workflow_dispatch' }}
123-
target: builder
123+
target: build
124124
labels: ${{ steps.meta.outputs.labels }}
125125
outputs: |
126126
type=image,name=${{ env.DOCKER_REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true

ftl-build/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM alpine:3.22 AS builder
1+
FROM alpine:3.22 AS build
22

33
ARG TARGETPLATFORM
4-
ARG readlineversion=8.2
4+
ARG readlineversion=8.3
55
ARG termcapversion=1.3.1
6-
ARG nettleversion=3.10.1
7-
ARG mbedtlsversion=3.6.3.1
6+
ARG nettleversion=3.10.2
7+
ARG mbedtlsversion=3.6.4
88

99
RUN apk add --no-cache \
1010
alpine-sdk \
@@ -102,7 +102,7 @@ RUN git clone https://github.com/bats-core/bats-core.git
102102

103103
ENV BATS=/bats-core/bin/bats
104104

105-
FROM builder AS tester
105+
FROM build AS test
106106

107107
# For FTL test compilation
108108
ARG TARGETPLATFORM

0 commit comments

Comments
 (0)