Skip to content

Commit ce8e758

Browse files
committed
Alpine Linux 3.21
1 parent ce01215 commit ce8e758

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

Dockerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,27 @@
11
# syntax=docker/dockerfile:1
22

33
ARG PUREFTPD_VERSION=1.0.50
4-
ARG ALPINE_VERSION=3.17
5-
ARG XX_VERSION=1.2.1
4+
ARG ALPINE_VERSION=3.21
5+
ARG XX_VERSION=1.6.1
66

77
FROM --platform=${BUILDPLATFORM} tonistiigi/xx:${XX_VERSION} AS xx
88

99
FROM --platform=${BUILDPLATFORM} crazymax/alpine-s6:${ALPINE_VERSION}-2.2.0.3 AS src
10-
COPY --from=xx / /
1110
RUN apk --update --no-cache add git patch
1211
WORKDIR /src/pure-ftpd
13-
RUN git init . && git remote add origin "https://github.com/jedisct1/pure-ftpd.git"
1412
ARG PUREFTPD_VERSION
15-
RUN git fetch origin "${PUREFTPD_VERSION}" && git checkout -q FETCH_HEAD
13+
ADD "https://github.com/jedisct1/pure-ftpd.git#${PUREFTPD_VERSION}" .
1614
COPY patchs /src
1715
RUN patch -p1 < ../minimal.patch
1816

1917
FROM --platform=${BUILDPLATFORM} crazymax/alpine-s6:${ALPINE_VERSION}-2.2.0.3 AS builder
2018
COPY --from=xx / /
21-
RUN apk --update --no-cache add autoconf automake binutils clang14 file make pkgconf tar xz
19+
RUN apk --update --no-cache add autoconf automake binutils clang file make pkgconf tar xz
2220
ENV XX_CC_PREFER_LINKER=ld
2321
ARG TARGETPLATFORM
2422
RUN xx-apk --no-cache --update add \
2523
gcc \
24+
libldap \
2625
linux-headers \
2726
musl-dev \
2827
libsodium-dev \

Dockerfile-1.0.47

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
# syntax=docker/dockerfile:1
22

33
ARG PUREFTPD_VERSION=1.0.47
4-
ARG ALPINE_VERSION=3.17
4+
ARG ALPINE_VERSION=3.21
55

6-
FROM --platform=${BUILDPLATFORM:-linux/amd64} crazymax/alpine-s6:${ALPINE_VERSION}-2.2.0.3 AS download
6+
FROM --platform=${BUILDPLATFORM:-linux/amd64} crazymax/alpine-s6:${ALPINE_VERSION}-2.2.0.3 AS src
77
RUN apk --update --no-cache add curl patch tar
8-
9-
ARG PUREFTPD_VERSION
108
WORKDIR /dist/pureftpd
119
COPY patchs /dist
10+
ARG PUREFTPD_VERSION
1211
RUN curl -sSL "https://download.pureftpd.org/pub/pure-ftpd/releases/obsolete/pure-ftpd-${PUREFTPD_VERSION}.tar.gz" | tar xz --strip 1 \
1312
&& patch -p1 < ../minimal.patch
1413

@@ -26,7 +25,7 @@ RUN apk --update --no-cache add \
2625
openssl-dev \
2726
&& rm -rf /tmp/*
2827

29-
COPY --from=download /dist/pureftpd /tmp/pureftpd
28+
COPY --from=src /dist/pureftpd /tmp/pureftpd
3029
WORKDIR /tmp/pureftpd
3130
RUN ./configure \
3231
--prefix=/pure-ftpd \

0 commit comments

Comments
 (0)