Skip to content

Commit a4f3661

Browse files
committed
Remove superfluous commands in Dockerfiles
The `rm -f cabal.project` command had no effect as it ran in the wrong directory. Furthermore, removing the file leads to cabal errors, so the command is dropped instead of fixed.
1 parent 3d215d6 commit a4f3661

File tree

3 files changed

+2
-20
lines changed

3 files changed

+2
-20
lines changed

alpine/Dockerfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Base ##################################################################
2-
ARG base_image_version=3.16
2+
ARG base_image_version=3.20
33
FROM alpine:$base_image_version AS alpine-builder-base
44
WORKDIR /app
55

@@ -31,10 +31,6 @@ ARG pandoc_commit=main
3131
RUN git clone --branch=$pandoc_commit --depth=1 --quiet \
3232
https://github.com/jgm/pandoc /usr/src/pandoc
3333

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-
3834
COPY ./alpine/freeze/pandoc-$pandoc_commit.project.freeze \
3935
/usr/src/pandoc/cabal.project.freeze
4036

static/Dockerfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Builder
2-
ARG base_image_version=3.14
2+
ARG base_image_version=3.20
33
FROM alpine:$base_image_version AS static-builder-base
4-
WORKDIR /app
54

65
RUN apk --no-cache add \
76
alpine-sdk \
@@ -24,10 +23,6 @@ ARG pandoc_commit=main
2423
RUN git clone --branch=$pandoc_commit --depth=1 --quiet \
2524
https://github.com/jgm/pandoc /usr/src/pandoc
2625

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-
3126
COPY ./static/freeze/pandoc-$pandoc_commit.project.freeze \
3227
/usr/src/pandoc/cabal.project.freeze
3328

ubuntu/Dockerfile

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
# Base ##################################################################
22
ARG base_image_version=noble
33
FROM ubuntu:$base_image_version AS ubuntu-builder-base
4-
WORKDIR /app
54

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
105
ARG lua_version=5.4
116
ENV DEBIAN_FRONTEND noninteractive
127
RUN apt-get -q --no-allow-insecure-repositories update \
@@ -35,10 +30,6 @@ ARG pandoc_commit=main
3530
RUN git clone --branch=$pandoc_commit --depth=1 --quiet \
3631
https://github.com/jgm/pandoc /usr/src/pandoc
3732

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-
4233
COPY ./ubuntu/freeze/pandoc-$pandoc_commit.project.freeze \
4334
/usr/src/pandoc/cabal.project.freeze
4435

0 commit comments

Comments
 (0)