Skip to content

Commit 2c18e3c

Browse files
- glibc locale are generated now for the following definitions: [availaible locale](LOCALE.md).
- fixed issue **ebook-convert : Error: unsupported locale setting** #34 - updated README.md with new sections: Configuration of a converter, Known issues, Container Locale - updated libraries
1 parent 1a36816 commit 2c18e3c

File tree

4 files changed

+483
-71
lines changed

4 files changed

+483
-71
lines changed

CHANGELOG.md

+32
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,35 @@
1+
**2018-08-28 - v1.2.2**
2+
3+
* glibc locale are generated now for the following definitions: [availaible locale](LOCALE.md).
4+
* fixed issue **ebook-convert : Error: unsupported locale setting** #34
5+
* updated README.md with new sections:
6+
- Configuration of a converter
7+
- Known issues
8+
- Container Locale
9+
* Updated Libraries
10+
- Sqlalchemy v1.2.10 => v1.2.11
11+
- Calibre converter ebook-convert (calibre 3.29.0) => (calibre 3.30.0)
12+
- Gevent v1.3.5 => v1.3.6
13+
14+
| **Program library** | **Installed Version** |
15+
| ------------------- | --------------------- |
16+
| Sqlite | v3.24.0 |
17+
| lxml | v4.2.4.0 |
18+
| Image Magick | ImageMagick 6.9.10-10 Q16 x86_64 2018-08-15 https://www.imagemagick.org |
19+
| kindlegen | Amazon kindlegen(Linux) V2.9 build 1028-0897292 |
20+
| Flask | v1.0.2 |
21+
| Babel | v2.6.0 |
22+
| PyPdf | v1.26.0 |
23+
| pySqlite | v2.6.0 |
24+
| Python | 2.7.15 (default, May 10 2018, 21:00:22) [GCC 6.4.0] |
25+
| Sqlalchemy | v1.2.11 |
26+
| Iso 639 | v0.4.5 |
27+
| Calibre converter | ebook-convert (calibre 3.30.0) |
28+
| Gevent | v1.3.6 |
29+
| Requests | v2.19.1 |
30+
| Flask Login | v0.4.1 |
31+
| Flask Principal | v0.4.0 |
32+
133
**2018-08-21 - v1.2.1**
234

335
* fixed issue that the execution of Calibre's `ebook-convert` didn't worked correct,

Dockerfile

+23-23
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
FROM technosoft2000/alpine-base:3.8-1
22
MAINTAINER Technosoft2000 <[email protected]>
3-
LABEL image.version="1.2.1" \
3+
LABEL image.version="1.2.2" \
44
image.description="Docker image for Calibre Web, based on docker image of Alpine" \
5-
image.date="2018-08-21" \
5+
image.date="2018-08-28" \
66
url.docker="https://hub.docker.com/r/technosoft2000/calibre-web" \
77
url.github="https://github.com/Technosoft2000/docker-calibre-web" \
88
url.support="https://cytec.us/forum"
99

1010
# Set basic environment settings
1111
ENV \
1212
# - VERSION: the docker image version (corresponds to the above LABEL image.version)
13-
VERSION="1.2.1" \
13+
VERSION="1.2.2" \
1414

15-
# - LANG: set C.UTF-8 locale as default system language
16-
LANG="C.UTF-8" \
15+
# - LANG, LANGUAGE, LC_ALL: language dependent settings (Default: en_US.UTF-8)
16+
LANG="en_US.UTF-8" \
17+
LANGUAGE="en_US.UTF-8" \
18+
LC_ALL="en_US.UTF-8" \
1719

1820
# - PUSER, PGROUP: the APP user and group name
1921
PUSER="calibre" \
@@ -57,6 +59,7 @@ ENV \
5759

5860
# Install GNU libc (aka glibc)
5961
# https://github.com/sgerrand/alpine-pkg-glibc
62+
COPY LOCALE.md /init/
6063
RUN \
6164

6265
ALPINE_GLIBC_BASE_URL="https://github.com/sgerrand/alpine-pkg-glibc/releases/download" && \
@@ -70,35 +73,32 @@ RUN \
7073
mkdir -p /var/cache/apk && \
7174

7275
apk add --no-cache --virtual=.build-dependencies wget ca-certificates && \
76+
apk add --no-cache parallel && \
7377

74-
wget \
75-
"https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub" \
76-
-O "/etc/apk/keys/sgerrand.rsa.pub" && \
78+
wget "https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub" \
79+
-O "/etc/apk/keys/sgerrand.rsa.pub" && \
7780

78-
wget \
79-
"$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" \
80-
"$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" \
81-
"$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_I18N_PACKAGE_FILENAME" && \
81+
wget "$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" \
82+
"$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" \
83+
"$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_I18N_PACKAGE_FILENAME" && \
8284

8385
apk add --no-cache \
8486
"$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" \
8587
"$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" \
8688
"$ALPINE_GLIBC_I18N_PACKAGE_FILENAME" && \
8789

88-
rm "/etc/apk/keys/sgerrand.rsa.pub" && \
89-
/usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 "$LANG" || true && \
90-
echo "export LANG=$LANG" > /etc/profile.d/locale.sh && \
91-
92-
apk del glibc-i18n && \
93-
94-
rm "/root/.wget-hsts" && \
90+
# iterate through all locale and install it
91+
# NOTE: locale -a is not available in alpine linux,
92+
# use `/usr/glibc-compat/bin/locale -a` instead
93+
cat /init/LOCALE.md | parallel "echo generate locale {}; /usr/glibc-compat/bin/localedef --force --inputfile {} --charmap UTF-8 {}.UTF-8;" && \
9594

9695
apk del .build-dependencies && \
9796

98-
rm \
99-
"$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" \
100-
"$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" \
101-
"$ALPINE_GLIBC_I18N_PACKAGE_FILENAME"
97+
rm "/etc/apk/keys/sgerrand.rsa.pub" && \
98+
rm "/root/.wget-hsts" && \
99+
rm "$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" \
100+
"$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" \
101+
"$ALPINE_GLIBC_I18N_PACKAGE_FILENAME"
102102

103103
RUN \
104104
# update the package list

LOCALE.md

+261
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,261 @@
1+
aa_DJ
2+
aa_ER
3+
aa_ET
4+
af_ZA
5+
am_ET
6+
an_ES
7+
ar_AE
8+
ar_BH
9+
ar_DZ
10+
ar_EG
11+
ar_IN
12+
ar_IQ
13+
ar_JO
14+
ar_KW
15+
ar_LB
16+
ar_LY
17+
ar_MA
18+
ar_OM
19+
ar_QA
20+
ar_SA
21+
ar_SD
22+
ar_SY
23+
ar_TN
24+
ar_YE
25+
as_IN
26+
ast_ES
27+
ayc_PE
28+
az_AZ
29+
be_BY
30+
bem_ZM
31+
ber_DZ
32+
ber_MA
33+
bg_BG
34+
bho_IN
35+
bn_BD
36+
bn_IN
37+
bo_CN
38+
bo_IN
39+
br_FR
40+
brx_IN
41+
bs_BA
42+
byn_ER
43+
ca_AD
44+
ca_ES
45+
ca_FR
46+
ca_IT
47+
crh_UA
48+
csb_PL
49+
cs_CZ
50+
cv_RU
51+
cy_GB
52+
da_DK
53+
de_AT
54+
de_BE
55+
de_CH
56+
de_DE
57+
de_LU
58+
doi_IN
59+
dv_MV
60+
dz_BT
61+
el_CY
62+
el_GR
63+
en_AG
64+
en_AU
65+
en_BW
66+
en_CA
67+
en_DK
68+
en_GB
69+
en_HK
70+
en_IE
71+
en_IN
72+
en_NG
73+
en_NZ
74+
en_PH
75+
en_SG
76+
en_US
77+
en_ZA
78+
en_ZM
79+
en_ZW
80+
es_AR
81+
es_BO
82+
es_CL
83+
es_CO
84+
es_CR
85+
es_CU
86+
es_DO
87+
es_EC
88+
es_ES
89+
es_GT
90+
es_HN
91+
es_MX
92+
es_NI
93+
es_PA
94+
es_PE
95+
es_PR
96+
es_PY
97+
es_SV
98+
es_US
99+
es_UY
100+
es_VE
101+
et_EE
102+
eu_ES
103+
fa_IR
104+
ff_SN
105+
fi_FI
106+
fil_PH
107+
fo_FO
108+
fr_BE
109+
fr_CA
110+
fr_CH
111+
fr_FR
112+
fr_LU
113+
fur_IT
114+
fy_DE
115+
fy_NL
116+
ga_IE
117+
gd_GB
118+
gez_ER
119+
gez_ET
120+
gl_ES
121+
gu_IN
122+
gv_GB
123+
ha_NG
124+
he_IL
125+
hi_IN
126+
hne_IN
127+
hr_HR
128+
hsb_DE
129+
ht_HT
130+
hu_HU
131+
hy_AM
132+
ia_FR
133+
id_ID
134+
ig_NG
135+
ik_CA
136+
is_IS
137+
it_CH
138+
it_IT
139+
iu_CA
140+
ja_JP
141+
ka_GE
142+
kk_KZ
143+
kl_GL
144+
km_KH
145+
kn_IN
146+
kok_IN
147+
ko_KR
148+
ks_IN
149+
ku_TR
150+
kw_GB
151+
ky_KG
152+
lb_LU
153+
lg_UG
154+
li_BE
155+
lij_IT
156+
li_NL
157+
lo_LA
158+
lt_LT
159+
lv_LV
160+
mag_IN
161+
mai_IN
162+
mg_MG
163+
mhr_RU
164+
mi_NZ
165+
mk_MK
166+
ml_IN
167+
mni_IN
168+
mn_MN
169+
mr_IN
170+
ms_MY
171+
mt_MT
172+
my_MM
173+
nb_NO
174+
nds_DE
175+
nds_NL
176+
ne_NP
177+
nhn_MX
178+
niu_NU
179+
niu_NZ
180+
nl_AW
181+
nl_BE
182+
nl_NL
183+
nn_NO
184+
nr_ZA
185+
nso_ZA
186+
oc_FR
187+
om_ET
188+
om_KE
189+
or_IN
190+
os_RU
191+
pa_IN
192+
pa_PK
193+
pl_PL
194+
ps_AF
195+
pt_BR
196+
pt_PT
197+
ro_RO
198+
ru_RU
199+
ru_UA
200+
rw_RW
201+
sa_IN
202+
sat_IN
203+
sc_IT
204+
sd_IN
205+
se_NO
206+
shs_CA
207+
sid_ET
208+
si_LK
209+
sk_SK
210+
sl_SI
211+
so_DJ
212+
so_ET
213+
so_KE
214+
so_SO
215+
sq_AL
216+
sq_MK
217+
sr_ME
218+
sr_RS
219+
ss_ZA
220+
st_ZA
221+
sv_FI
222+
sv_SE
223+
sw_KE
224+
sw_TZ
225+
szl_PL
226+
ta_IN
227+
ta_LK
228+
te_IN
229+
tg_TJ
230+
th_TH
231+
ti_ER
232+
ti_ET
233+
tig_ER
234+
tk_TM
235+
tl_PH
236+
tn_ZA
237+
tr_CY
238+
tr_TR
239+
ts_ZA
240+
tt_RU
241+
ug_CN
242+
uk_UA
243+
unm_US
244+
ur_IN
245+
ur_PK
246+
uz_UZ
247+
ve_ZA
248+
vi_VN
249+
wa_BE
250+
wae_CH
251+
wal_ET
252+
wo_SN
253+
xh_ZA
254+
yi_US
255+
yo_NG
256+
yue_HK
257+
zh_CN
258+
zh_HK
259+
zh_SG
260+
zh_TW
261+
zu_ZA

0 commit comments

Comments
 (0)