File tree Expand file tree Collapse file tree 3 files changed +2
-20
lines changed Expand file tree Collapse file tree 3 files changed +2
-20
lines changed Original file line number Diff line number Diff line change 1
1
# Base ##################################################################
2
- ARG base_image_version=3.16
2
+ ARG base_image_version=3.20
3
3
FROM alpine:$base_image_version AS alpine-builder-base
4
4
WORKDIR /app
5
5
@@ -31,10 +31,6 @@ ARG pandoc_commit=main
31
31
RUN git clone --branch=$pandoc_commit --depth=1 --quiet \
32
32
https://github.com/jgm/pandoc /usr/src/pandoc
33
33
34
- # Remove the settings that ship with pandoc, unless we're building the main
35
- # branch.
36
- RUN [ "${pandoc_commit}" = "main" ] || rm -f cabal.project
37
-
38
34
COPY ./alpine/freeze/pandoc-$pandoc_commit.project.freeze \
39
35
/usr/src/pandoc/cabal.project.freeze
40
36
Original file line number Diff line number Diff line change 1
1
# Builder
2
- ARG base_image_version=3.14
2
+ ARG base_image_version=3.20
3
3
FROM alpine:$base_image_version AS static-builder-base
4
- WORKDIR /app
5
4
6
5
RUN apk --no-cache add \
7
6
alpine-sdk \
@@ -24,10 +23,6 @@ ARG pandoc_commit=main
24
23
RUN git clone --branch=$pandoc_commit --depth=1 --quiet \
25
24
https://github.com/jgm/pandoc /usr/src/pandoc
26
25
27
- # Remove the settings that ship with pandoc, unless we're building the main
28
- # branch.
29
- RUN [ "${pandoc_commit}" = "main" ] || rm -f cabal.project
30
-
31
26
COPY ./static/freeze/pandoc-$pandoc_commit.project.freeze \
32
27
/usr/src/pandoc/cabal.project.freeze
33
28
Original file line number Diff line number Diff line change 1
1
# Base ##################################################################
2
2
ARG base_image_version=noble
3
3
FROM ubuntu:$base_image_version AS ubuntu-builder-base
4
- WORKDIR /app
5
4
6
- # # An ARG instruction goes out of scope at the end of the build stage
7
- # # where it was defined. To use an argument in multiple stages, each stage
8
- # # must include the ARG instruction
9
- ARG base_image_version=noble
10
5
ARG lua_version=5.4
11
6
ENV DEBIAN_FRONTEND noninteractive
12
7
RUN apt-get -q --no-allow-insecure-repositories update \
@@ -35,10 +30,6 @@ ARG pandoc_commit=main
35
30
RUN git clone --branch=$pandoc_commit --depth=1 --quiet \
36
31
https://github.com/jgm/pandoc /usr/src/pandoc
37
32
38
- # Remove the settings that ship with pandoc, unless we're building the main
39
- # branch.
40
- RUN [ "${pandoc_commit}" = "main" ] || rm -f cabal.project
41
-
42
33
COPY ./ubuntu/freeze/pandoc-$pandoc_commit.project.freeze \
43
34
/usr/src/pandoc/cabal.project.freeze
44
35
You can’t perform that action at this time.
0 commit comments