Updating ubuntu image, improving dockerfile caching

Author: andrewpollack

publishing/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 # Must run from base TWIR directory... makefile takes care of this.
 WORKDIR /usr/twir
@@ -13,19 +13,19 @@ RUN ln -s /usr/bin/python3.8 /usr/bin/python
 COPY requirements.txt .
 RUN pip3 install -r requirements.txt
 
-# pelican setup
-COPY content content
-COPY plugins plugins
-COPY themes themes
-COPY pelicanconf.py pelicanconf.py
-
 # sass/juice
 RUN apt-get install -y curl
 RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
 RUN apt-get install -y nodejs
 RUN npm install -g sass
 RUN npm install -g juice
 
+# pelican setup
+COPY content content
+COPY plugins plugins
+COPY themes themes
+COPY pelicanconf.py pelicanconf.py
+
 COPY publishing/run_server.sh run_server.sh
 RUN chmod 777 run_server.sh
 COPY publishing/create_html_friendly_page.sh create_html_friendly_page.sh

publishing/Makefile

@@ -37,18 +37,18 @@ clean:
 	rm -rf output/
 
 generate-website: clean
-	docker run \
+	docker run -it \
 		-v $(shell pwd)/output:/usr/twir/output \
 		twir:latest 
 
 generate-email: clean
-	docker run \
+	docker run -it \
 		-e TWIR_NEWSLETTER_THEME=1 \
 		-v $(shell pwd)/output:/usr/twir/output \
 		twir:latest
 
 host-content:
-	docker run \
+	docker run -it \
 		-p 8000:8000 \
 	 	-v $(shell pwd)/output:/usr/twir/output:ro \
 		-it \

requirements.txt

@@ -1,7 +1,8 @@
-Markdown==3.3.6
-pelican==4.7.1
-feedgenerator==2.0
-pelican-webassets==2.0.0
 cssmin==0.2.0
+feedgenerator==2.0
 jinja2==2.11.3
 libsass==0.21.0
+Markdown==3.3.6
+markupsafe==2.0.1
+pelican==4.7.1
+pelican-webassets==2.0.0