Skip to content

Commit 7046436

Browse files
tianontianon
committed
Update comment and update formatting
1 parent 5fd356b commit 7046436

File tree

9 files changed

+55
-44
lines changed

9 files changed

+55
-44
lines changed

‎3.4/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ RUN set -eux; \
1616
openssh-client \
1717
subversion \
1818
\
19-
# https://github.com/docker-library/redmine/issues/132
20-
# (without "gsfonts" we get "Magick::ImageMagickError (non-conforming drawing primitive definition `text' @ error/draw.c/DrawImage/3265):")
19+
# we need "gsfonts" for generating PNGs of Gantt charts
20+
# and "ghostscript" for creating PDF thumbnails (in 4.1+)
2121
gsfonts \
2222
imagemagick \
2323
; \
@@ -100,13 +100,13 @@ RUN set -eux; \
100100
apt-get install -y --no-install-recommends \
101101
freetds-dev \
102102
gcc \
103-
libmagickcore-dev \
104-
libmagickwand-dev \
105103
libmariadbclient-dev \
106104
libpq-dev \
107105
libsqlite3-dev \
108106
make \
109107
patch \
108+
# in 4.1+, libmagickcore-dev and libmagickwand-dev are no longer necessary/used: https://www.redmine.org/issues/30492
109+
libmagickcore-dev libmagickwand-dev \
110110
; \
111111
rm -rf /var/lib/apt/lists/*; \
112112
\

‎3.4/alpine/Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ RUN set -eux; \
2020
openssh-client \
2121
subversion \
2222
\
23-
# https://github.com/docker-library/redmine/issues/132
24-
# (without "ghostscript-fonts" we get "Magick::ImageMagickError (non-conforming drawing primitive definition `text' @ error/draw.c/DrawImage/3265):")
23+
# we need "gsfonts" for generating PNGs of Gantt charts
24+
# and "ghostscript" for creating PDF thumbnails (in 4.1+)
2525
ghostscript-fonts \
2626
imagemagick6 \
2727
;
@@ -60,7 +60,6 @@ RUN set -eux; \
6060
coreutils \
6161
freetds-dev \
6262
gcc \
63-
imagemagick6-dev \
6463
make \
6564
mariadb-dev \
6665
musl-dev \
@@ -69,6 +68,8 @@ RUN set -eux; \
6968
sqlite-dev \
7069
ttf2ufm \
7170
zlib-dev \
71+
# in 4.1+, imagemagick6-dev is no longer necessary/used: https://www.redmine.org/issues/30492
72+
imagemagick6-dev \
7273
; \
7374
\
7475
su-exec redmine bundle install --jobs "$(nproc)" --without development test; \

‎4.0/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ RUN set -eux; \
1616
openssh-client \
1717
subversion \
1818
\
19-
# https://github.com/docker-library/redmine/issues/132
20-
# (without "gsfonts" we get "Magick::ImageMagickError (non-conforming drawing primitive definition `text' @ error/draw.c/DrawImage/3265):")
19+
# we need "gsfonts" for generating PNGs of Gantt charts
20+
# and "ghostscript" for creating PDF thumbnails (in 4.1+)
2121
gsfonts \
2222
imagemagick \
2323
; \
@@ -100,13 +100,13 @@ RUN set -eux; \
100100
apt-get install -y --no-install-recommends \
101101
freetds-dev \
102102
gcc \
103-
libmagickcore-dev \
104-
libmagickwand-dev \
105103
libmariadbclient-dev \
106104
libpq-dev \
107105
libsqlite3-dev \
108106
make \
109107
patch \
108+
# in 4.1+, libmagickcore-dev and libmagickwand-dev are no longer necessary/used: https://www.redmine.org/issues/30492
109+
libmagickcore-dev libmagickwand-dev \
110110
; \
111111
rm -rf /var/lib/apt/lists/*; \
112112
\

‎4.0/alpine/Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ RUN set -eux; \
2020
openssh-client \
2121
subversion \
2222
\
23-
# https://github.com/docker-library/redmine/issues/132
24-
# (without "ghostscript-fonts" we get "Magick::ImageMagickError (non-conforming drawing primitive definition `text' @ error/draw.c/DrawImage/3265):")
23+
# we need "gsfonts" for generating PNGs of Gantt charts
24+
# and "ghostscript" for creating PDF thumbnails (in 4.1+)
2525
ghostscript-fonts \
2626
imagemagick6 \
2727
;
@@ -60,7 +60,6 @@ RUN set -eux; \
6060
coreutils \
6161
freetds-dev \
6262
gcc \
63-
imagemagick6-dev \
6463
make \
6564
mariadb-dev \
6665
musl-dev \
@@ -69,6 +68,8 @@ RUN set -eux; \
6968
sqlite-dev \
7069
ttf2ufm \
7170
zlib-dev \
71+
# in 4.1+, imagemagick6-dev is no longer necessary/used: https://www.redmine.org/issues/30492
72+
imagemagick6-dev \
7273
; \
7374
\
7475
su-exec redmine bundle install --jobs "$(nproc)" --without development test; \

‎4.1/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ RUN set -eux; \
1616
openssh-client \
1717
subversion \
1818
\
19-
# https://github.com/docker-library/redmine/issues/132
20-
# (without "gsfonts" we get "Magick::ImageMagickError (non-conforming drawing primitive definition `text' @ error/draw.c/DrawImage/3265):")
19+
# we need "gsfonts" for generating PNGs of Gantt charts
20+
# and "ghostscript" for creating PDF thumbnails (in 4.1+)
2121
ghostscript \
2222
gsfonts \
2323
imagemagick \

‎4.1/alpine/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ RUN set -eux; \
2020
openssh-client \
2121
subversion \
2222
\
23-
# https://github.com/docker-library/redmine/issues/132
24-
# (without "ghostscript-fonts" we get "Magick::ImageMagickError (non-conforming drawing primitive definition `text' @ error/draw.c/DrawImage/3265):")
23+
# we need "gsfonts" for generating PNGs of Gantt charts
24+
# and "ghostscript" for creating PDF thumbnails (in 4.1+)
2525
ghostscript \
2626
ghostscript-fonts \
2727
imagemagick \

‎Dockerfile-alpine.template‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ RUN set -eux; \
2020
openssh-client \
2121
subversion \
2222
\
23-
# https://github.com/docker-library/redmine/issues/132
24-
# (without "ghostscript-fonts" we get "Magick::ImageMagickError (non-conforming drawing primitive definition `text' @ error/draw.c/DrawImage/3265):")
23+
# we need "gsfonts" for generating PNGs of Gantt charts
24+
# and "ghostscript" for creating PDF thumbnails (in 4.1+)
2525
ghostscript \
2626
ghostscript-fonts \
2727
imagemagick \
@@ -69,6 +69,8 @@ RUN set -eux; \
6969
sqlite-dev \
7070
ttf2ufm \
7171
zlib-dev \
72+
# in 4.1+, imagemagick-dev is no longer necessary/used: https://www.redmine.org/issues/30492
73+
imagemagick-dev \
7274
; \
7375
\
7476
su-exec redmine bundle install --jobs "$(nproc)" --without development test; \

‎Dockerfile-debian.template‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ RUN set -eux; \
1616
openssh-client \
1717
subversion \
1818
\
19-
# https://github.com/docker-library/redmine/issues/132
20-
# (without "gsfonts" we get "Magick::ImageMagickError (non-conforming drawing primitive definition `text' @ error/draw.c/DrawImage/3265):")
19+
# we need "gsfonts" for generating PNGs of Gantt charts
20+
# and "ghostscript" for creating PDF thumbnails (in 4.1+)
2121
ghostscript \
2222
gsfonts \
2323
imagemagick \
@@ -106,6 +106,8 @@ RUN set -eux; \
106106
libsqlite3-dev \
107107
make \
108108
patch \
109+
# in 4.1+, libmagickcore-dev and libmagickwand-dev are no longer necessary/used: https://www.redmine.org/issues/30492
110+
libmagickcore-dev libmagickwand-dev \
109111
; \
110112
rm -rf /var/lib/apt/lists/*; \
111113
\

‎update.sh‎

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -29,39 +29,44 @@ for version in "${versions[@]}"; do
2929

3030
echo "$version: $fullVersion (ruby $rubyVersion; passenger $passenger)"
3131

32-
sedExpr='
33-
s/%%REDMINE_VERSION%%/'"$fullVersion"'/;
34-
s/%%RUBY_VERSION%%/'"$rubyVersion"'/;
35-
s/%%REDMINE_DOWNLOAD_MD5%%/'"$md5"'/;
36-
s/%%REDMINE%%/redmine:'"$version"'/;
37-
s/%%PASSENGER_VERSION%%/'"$passenger"'/;
38-
'
39-
sedAlpineExpr="$sedExpr"
40-
sedDebianExpr="$sedExpr"
32+
commonSedArgs=(
33+
-r
34+
-e 's/%%REDMINE_VERSION%%/'"$fullVersion"'/'
35+
-e 's/%%RUBY_VERSION%%/'"$rubyVersion"'/'
36+
-e 's/%%REDMINE_DOWNLOAD_MD5%%/'"$md5"'/'
37+
-e 's/%%REDMINE%%/redmine:'"$version"'/'
38+
-e 's/%%PASSENGER_VERSION%%/'"$passenger"'/'
39+
)
40+
alpineSedArgs=()
4141

42+
# https://github.com/docker-library/redmine/pull/184
43+
# https://www.redmine.org/issues/22481
44+
# https://www.redmine.org/issues/30492
4245
if [ "$version" = 3.4 ] || [ "$version" = 4.0 ]; then
43-
sedAlpineExpr+='
44-
s/imagemagick /imagemagick6 /;
45-
/ghostscript /d;
46-
/gcc/a \\t\timagemagick6-dev \\
47-
'
48-
sedDebianExpr+='
49-
/ghostscript /d;
50-
/gcc/a \\t\tlibmagickcore-dev \\
51-
/gcc/a \\t\tlibmagickwand-dev \\
52-
'
46+
commonSedArgs+=(
47+
-e '/ghostscript /d'
48+
)
49+
alpineSedArgs+=(
50+
-e 's/imagemagick/imagemagick6/g'
51+
)
52+
else
53+
commonSedArgs+=(
54+
-e '/imagemagick-dev/d'
55+
-e '/libmagickcore-dev/d'
56+
-e '/libmagickwand-dev/d'
57+
)
5358
fi
5459

5560
cp docker-entrypoint.sh "$version/"
56-
sed -r "$sedDebianExpr" Dockerfile-debian.template > "$version/Dockerfile"
61+
sed "${commonSedArgs[@]}" Dockerfile-debian.template > "$version/Dockerfile"
5762

5863
mkdir -p "$version/passenger"
59-
sed -r "$sedExpr" Dockerfile-passenger.template > "$version/passenger/Dockerfile"
64+
sed "${commonSedArgs[@]}" Dockerfile-passenger.template > "$version/passenger/Dockerfile"
6065

6166
mkdir -p "$version/alpine"
6267
cp docker-entrypoint.sh "$version/alpine/"
6368
sed -i -e 's/gosu/su-exec/g' "$version/alpine/docker-entrypoint.sh"
64-
sed -r "$sedAlpineExpr" Dockerfile-alpine.template > "$version/alpine/Dockerfile"
69+
sed "${commonSedArgs[@]}" "${alpineSedArgs[@]}" Dockerfile-alpine.template > "$version/alpine/Dockerfile"
6570

6671
travisEnv='\n - VERSION='"$version/alpine$travisEnv"
6772
travisEnv='\n - VERSION='"$version$travisEnv"

0 commit comments

Comments
 (0)