@@ -9,6 +9,7 @@ VERSION ?= $(DEFAULT_VERSION)
9
9
PATCHLEVEL ?= 1
10
10
11
11
MODULES ?= go jsc node perl php python ruby wasm
12
+ MODULES_SLIM ?= python
12
13
13
14
VARIANT ?= bookworm
14
15
@@ -62,6 +63,7 @@ MODULE_PREBUILD_php ?= /bin/true
62
63
VERSIONS_python ?= 3.11 3.12
63
64
VARIANT_python ?= $(VARIANT )
64
65
$(foreach pythonversion, $(VERSIONS_python ) , $(eval CONTAINER_python$(pythonversion ) = python :$(pythonversion ) -$(VARIANT_python ) ))
66
+ $(foreach pythonversion, $(VERSIONS_python ) , $(eval CONTAINER_python$(pythonversion ) -slim = python :$(pythonversion ) -slim-$(VARIANT_python ) ))
65
67
CONFIGURE_python ?= python --config=/usr/local/bin/python3-config
66
68
INSTALL_python ?= python3-install
67
69
RUN_python ?= /bin/true
@@ -109,9 +111,11 @@ endef
109
111
default:
110
112
@echo " valid targets: all build dockerfiles library clean"
111
113
112
- MODVERSIONS = $( foreach module, $( MODULES) , $( foreach modversion, $( shell for v in $( VERSIONS_$( module) ) ; do echo $$ v; done | sort -r) , $( module) $( modversion) ) ) wasm minimal
114
+ MODVERSIONS = $( foreach module, $( MODULES) , $( foreach modversion, $( shell for v in $( VERSIONS_$( module) ) ; do echo $$ v; done | sort -r) , $( module) $( modversion) ) )
115
+ MODVERSIONS += $( foreach module, $( MODULES_SLIM) , $( foreach modversion, $( shell for v in $( VERSIONS_$( module) ) ; do echo $$ v; done | sort -r) , $( module) $( modversion) -slim) )
116
+ MODVERSIONS += wasm minimal
113
117
114
- modname = $( shell echo $1 | /usr/bin/tr -d ' .01234567890-' )
118
+ modname = $( shell echo $1 | /usr/bin/tr -d ' .01234567890-' | sed ' s/slim// ' )
115
119
116
120
dockerfiles: $( addprefix Dockerfile., $( MODVERSIONS) )
117
121
build: $( addprefix build-, $( MODVERSIONS) )
@@ -141,10 +145,14 @@ library:
141
145
@previous=" " ; \
142
146
for mod in $( MODVERSIONS) ; do \
143
147
echo " " ; \
144
- modname=" $$ ( echo $$ mod | tr -d '.0123456789-' )" ; \
145
- TAGS=" $$ mod $$ {mod%%.*} $$ modname" ; \
148
+ modname=" $$ ( echo $$ mod | tr -d '.0123456789')" ; \
149
+ modmajor=" $$ {mod%%.*}" ; \
150
+ if test " $$ {mod#*slim}" != " $$ mod" ; then \
151
+ modmajor=" $$ {modmajor}-slim" ; \
152
+ fi; \
153
+ TAGS=" $$ mod $$ modmajor $$ modname" ; \
146
154
TAGS=" $$ (echo $$ TAGS | tr " " " \n " | sort -u -r | tr " \n " " ," | sed " s/,/, /g" )" ; \
147
- if [ " $$ previous" = " $$ modname " ] ; then \
155
+ if test " $$ { previous#* " $$ modname " } " ! = " $$ previous " ; then \
148
156
echo " Tags: $( VERSION) -$$ mod, $$ mod" ; \
149
157
else \
150
158
if [ " $$ mod" = " minimal" ]; then \
@@ -158,7 +166,7 @@ library:
158
166
echo " GitCommit: $( shell git describe --always --abbrev=0 HEAD) " ; \
159
167
echo " Directory: pkg/docker" ; \
160
168
echo " File: Dockerfile.$$ mod" ; \
161
- previous=$$ (echo $$ mod | tr -d ' .0123456789- ' ) ; \
169
+ previous=" $$ previous $$ modname " ; \
162
170
done
163
171
164
172
diff: $( addprefix diff-, $( MODVERSIONS) )
0 commit comments