Merge branch 'reimage'
2
Makefile
@ -62,7 +62,7 @@ help:
|
|||||||
@echo ' '
|
@echo ' '
|
||||||
|
|
||||||
html:
|
html:
|
||||||
$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
|
$(DOCKER_COMPOSE_CMD) $(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
[ ! -d $(OUTPUTDIR) ] || rm -rf $(OUTPUTDIR) && [ ! -d $(BASEDIR)/cache ] || rm -rf $(BASEDIR)/cache
|
[ ! -d $(OUTPUTDIR) ] || rm -rf $(OUTPUTDIR) && [ ! -d $(BASEDIR)/cache ] || rm -rf $(BASEDIR)/cache
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 336 KiB After Width: | Height: | Size: 241 KiB |
|
Before Width: | Height: | Size: 325 KiB After Width: | Height: | Size: 98 KiB |
|
Before Width: | Height: | Size: 311 KiB After Width: | Height: | Size: 88 KiB |
|
Before Width: | Height: | Size: 346 KiB After Width: | Height: | Size: 92 KiB |
|
Before Width: | Height: | Size: 350 KiB After Width: | Height: | Size: 262 KiB |
|
Before Width: | Height: | Size: 302 KiB After Width: | Height: | Size: 78 KiB |
|
Before Width: | Height: | Size: 312 KiB After Width: | Height: | Size: 227 KiB |
|
Before Width: | Height: | Size: 265 KiB After Width: | Height: | Size: 109 KiB |
|
Before Width: | Height: | Size: 324 KiB After Width: | Height: | Size: 244 KiB |
|
Before Width: | Height: | Size: 411 KiB After Width: | Height: | Size: 153 KiB |
|
Before Width: | Height: | Size: 292 KiB After Width: | Height: | Size: 118 KiB |
|
Before Width: | Height: | Size: 239 KiB After Width: | Height: | Size: 211 KiB |
|
Before Width: | Height: | Size: 236 KiB After Width: | Height: | Size: 212 KiB |
|
Before Width: | Height: | Size: 226 KiB After Width: | Height: | Size: 204 KiB |
|
Before Width: | Height: | Size: 252 KiB After Width: | Height: | Size: 246 KiB |
|
Before Width: | Height: | Size: 279 KiB After Width: | Height: | Size: 291 KiB |
|
Before Width: | Height: | Size: 104 KiB After Width: | Height: | Size: 38 KiB |
|
Before Width: | Height: | Size: 228 KiB After Width: | Height: | Size: 101 KiB |
|
Before Width: | Height: | Size: 244 KiB After Width: | Height: | Size: 216 KiB |
|
Before Width: | Height: | Size: 198 KiB After Width: | Height: | Size: 88 KiB |
|
Before Width: | Height: | Size: 226 KiB After Width: | Height: | Size: 110 KiB |
|
Before Width: | Height: | Size: 138 KiB After Width: | Height: | Size: 64 KiB |
|
Before Width: | Height: | Size: 153 KiB After Width: | Height: | Size: 66 KiB |
|
Before Width: | Height: | Size: 153 KiB After Width: | Height: | Size: 59 KiB |
|
Before Width: | Height: | Size: 278 KiB After Width: | Height: | Size: 116 KiB |
|
Before Width: | Height: | Size: 299 KiB After Width: | Height: | Size: 314 KiB |
|
Before Width: | Height: | Size: 227 KiB After Width: | Height: | Size: 90 KiB |
|
Before Width: | Height: | Size: 277 KiB After Width: | Height: | Size: 148 KiB |
|
Before Width: | Height: | Size: 298 KiB After Width: | Height: | Size: 125 KiB |
|
Before Width: | Height: | Size: 372 KiB After Width: | Height: | Size: 189 KiB |
|
Before Width: | Height: | Size: 280 KiB After Width: | Height: | Size: 129 KiB |
|
Before Width: | Height: | Size: 226 KiB After Width: | Height: | Size: 229 KiB |
|
Before Width: | Height: | Size: 313 KiB After Width: | Height: | Size: 148 KiB |
|
Before Width: | Height: | Size: 308 KiB After Width: | Height: | Size: 136 KiB |
|
Before Width: | Height: | Size: 298 KiB After Width: | Height: | Size: 132 KiB |
|
Before Width: | Height: | Size: 296 KiB After Width: | Height: | Size: 253 KiB |
|
Before Width: | Height: | Size: 307 KiB After Width: | Height: | Size: 246 KiB |
|
Before Width: | Height: | Size: 281 KiB After Width: | Height: | Size: 268 KiB |
|
Before Width: | Height: | Size: 282 KiB After Width: | Height: | Size: 133 KiB |
|
Before Width: | Height: | Size: 314 KiB After Width: | Height: | Size: 252 KiB |
|
Before Width: | Height: | Size: 328 KiB After Width: | Height: | Size: 287 KiB |
|
Before Width: | Height: | Size: 332 KiB After Width: | Height: | Size: 215 KiB |
|
Before Width: | Height: | Size: 256 KiB After Width: | Height: | Size: 108 KiB |
|
Before Width: | Height: | Size: 238 KiB After Width: | Height: | Size: 93 KiB |
|
Before Width: | Height: | Size: 301 KiB After Width: | Height: | Size: 115 KiB |
|
Before Width: | Height: | Size: 287 KiB After Width: | Height: | Size: 258 KiB |
|
Before Width: | Height: | Size: 321 KiB After Width: | Height: | Size: 288 KiB |
|
Before Width: | Height: | Size: 267 KiB After Width: | Height: | Size: 254 KiB |
|
Before Width: | Height: | Size: 233 KiB After Width: | Height: | Size: 192 KiB |
|
Before Width: | Height: | Size: 308 KiB After Width: | Height: | Size: 350 KiB |
|
Before Width: | Height: | Size: 289 KiB After Width: | Height: | Size: 270 KiB |
|
Before Width: | Height: | Size: 322 KiB After Width: | Height: | Size: 344 KiB |
|
Before Width: | Height: | Size: 331 KiB After Width: | Height: | Size: 338 KiB |
|
Before Width: | Height: | Size: 280 KiB After Width: | Height: | Size: 148 KiB |
|
Before Width: | Height: | Size: 272 KiB After Width: | Height: | Size: 288 KiB |
|
Before Width: | Height: | Size: 316 KiB After Width: | Height: | Size: 314 KiB |
|
Before Width: | Height: | Size: 301 KiB After Width: | Height: | Size: 290 KiB |
|
Before Width: | Height: | Size: 294 KiB After Width: | Height: | Size: 144 KiB |
|
Before Width: | Height: | Size: 242 KiB After Width: | Height: | Size: 261 KiB |
|
Before Width: | Height: | Size: 139 KiB After Width: | Height: | Size: 61 KiB |
|
Before Width: | Height: | Size: 198 KiB After Width: | Height: | Size: 166 KiB |
|
Before Width: | Height: | Size: 323 KiB After Width: | Height: | Size: 124 KiB |
|
Before Width: | Height: | Size: 252 KiB After Width: | Height: | Size: 99 KiB |
|
Before Width: | Height: | Size: 440 KiB After Width: | Height: | Size: 192 KiB |
|
Before Width: | Height: | Size: 351 KiB After Width: | Height: | Size: 168 KiB |
|
Before Width: | Height: | Size: 325 KiB After Width: | Height: | Size: 108 KiB |
|
Before Width: | Height: | Size: 324 KiB After Width: | Height: | Size: 115 KiB |
|
Before Width: | Height: | Size: 415 KiB After Width: | Height: | Size: 213 KiB |
|
Before Width: | Height: | Size: 228 KiB After Width: | Height: | Size: 74 KiB |
|
Before Width: | Height: | Size: 241 KiB After Width: | Height: | Size: 94 KiB |
|
Before Width: | Height: | Size: 181 KiB After Width: | Height: | Size: 49 KiB |
|
Before Width: | Height: | Size: 421 KiB After Width: | Height: | Size: 145 KiB |
|
Before Width: | Height: | Size: 206 KiB After Width: | Height: | Size: 80 KiB |
|
Before Width: | Height: | Size: 186 KiB After Width: | Height: | Size: 63 KiB |
|
Before Width: | Height: | Size: 270 KiB After Width: | Height: | Size: 263 KiB |
|
Before Width: | Height: | Size: 241 KiB After Width: | Height: | Size: 99 KiB |
|
Before Width: | Height: | Size: 371 KiB After Width: | Height: | Size: 193 KiB |
|
Before Width: | Height: | Size: 217 KiB After Width: | Height: | Size: 117 KiB |
|
Before Width: | Height: | Size: 299 KiB After Width: | Height: | Size: 309 KiB |
|
Before Width: | Height: | Size: 238 KiB After Width: | Height: | Size: 221 KiB |
|
Before Width: | Height: | Size: 136 KiB After Width: | Height: | Size: 61 KiB |
|
Before Width: | Height: | Size: 173 KiB After Width: | Height: | Size: 101 KiB |
|
Before Width: | Height: | Size: 212 KiB After Width: | Height: | Size: 101 KiB |
|
Before Width: | Height: | Size: 226 KiB After Width: | Height: | Size: 105 KiB |
|
Before Width: | Height: | Size: 366 KiB After Width: | Height: | Size: 143 KiB |
|
Before Width: | Height: | Size: 308 KiB After Width: | Height: | Size: 394 KiB |
|
Before Width: | Height: | Size: 210 KiB After Width: | Height: | Size: 280 KiB |
|
Before Width: | Height: | Size: 72 KiB After Width: | Height: | Size: 44 KiB |
|
Before Width: | Height: | Size: 210 KiB After Width: | Height: | Size: 194 KiB |
|
Before Width: | Height: | Size: 369 KiB After Width: | Height: | Size: 276 KiB |
|
Before Width: | Height: | Size: 268 KiB After Width: | Height: | Size: 228 KiB |
|
Before Width: | Height: | Size: 403 KiB After Width: | Height: | Size: 364 KiB |
|
Before Width: | Height: | Size: 175 KiB After Width: | Height: | Size: 107 KiB |
|
Before Width: | Height: | Size: 237 KiB After Width: | Height: | Size: 187 KiB |
|
Before Width: | Height: | Size: 289 KiB After Width: | Height: | Size: 122 KiB |
|
Before Width: | Height: | Size: 186 KiB After Width: | Height: | Size: 96 KiB |
|
Before Width: | Height: | Size: 301 KiB After Width: | Height: | Size: 214 KiB |
|
Before Width: | Height: | Size: 981 KiB After Width: | Height: | Size: 92 KiB |
|
Before Width: | Height: | Size: 313 KiB After Width: | Height: | Size: 282 KiB |