From 66d3ecccdd08b597f0e6dab6ae977f8b7f246173 Mon Sep 17 00:00:00 2001
From: Yannick Chabbert <yannick.chabbert.it@gmail.com>
Date: Tue, 19 Dec 2023 12:00:37 +0100
Subject: [PATCH] bump version to 1.7.0

---
 deploy/deploy.conf.sh.DIST |  1 +
 deploy/deploy.sh           |  2 +-
 docker-compose.prod.yaml   |  2 +-
 docker/prod/Dockerfile     | 12 +++++++-----
 env/.env.LOCAL             |  2 +-
 package.json               |  2 +-
 pyproject.toml             |  2 +-
 7 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/deploy/deploy.conf.sh.DIST b/deploy/deploy.conf.sh.DIST
index 8111592..0859f1f 100644
--- a/deploy/deploy.conf.sh.DIST
+++ b/deploy/deploy.conf.sh.DIST
@@ -19,6 +19,7 @@ FOLIOBLOG_GID=
 # FOLIOBLOG_REDIS_LOCATION=redis://redis:6379
 
 # Prod
+FOLIOBLOG_RELEASE=
 FOLIOBLOG_SECRET_KEY=
 FOLIOBLOG_ADMIN_PASSWD=
 FOLIOBLOG_EMAIL_HOST_PASSWORD=
diff --git a/deploy/deploy.sh b/deploy/deploy.sh
index bff23ee..3cb0dc9 100755
--- a/deploy/deploy.sh
+++ b/deploy/deploy.sh
@@ -154,7 +154,7 @@ deploy_prod() {
     sed -i 's,^# FOLIOBLOG_SECRET_KEY=.*,FOLIOBLOG_SECRET_KEY='"${FOLIOBLOG_SECRET_KEY:-bla-bla-bla}"',g' .env
     sed -i 's,^# FOLIOBLOG_ADMIN_PASSWD=.*,FOLIOBLOG_ADMIN_PASSWD='"${FOLIOBLOG_ADMIN_PASSWD:-admin}"',g' .env
     sed -i 's,^# FOLIOBLOG_EMAIL_HOST_PASSWORD=.*,FOLIOBLOG_EMAIL_HOST_PASSWORD='"${FOLIOBLOG_EMAIL_HOST_PASSWORD:-}"',g' .env
-    sed -i 's,^# FOLIOBLOG_VERSION=.*,FOLIOBLOG_VERSION='"$FOLIOBLOG_VERSION"',g' .env
+    sed -i 's,^# FOLIOBLOG_RELEASE=.*,FOLIOBLOG_RELEASE='"${FOLIOBLOG_RELEASE:-v1.7.0}"',g' .env
     sed -i 's,^# FOLIOBLOG_STATIC_ROOT=.*,FOLIOBLOG_STATIC_ROOT=/app/static,g' .env
     sed -i 's,^# FOLIOBLOG_NGINX_HOST=.*,FOLIOBLOG_NGINX_HOST=folio.local blog.folio.local demo.folio.local,g' .env
     sed -i 's,^# FOLIOBLOG_NGINX_MEDIA_ROOT=.*,FOLIOBLOG_NGINX_MEDIA_ROOT=/media,g' .env
diff --git a/docker-compose.prod.yaml b/docker-compose.prod.yaml
index d0f0b4a..e2e0677 100644
--- a/docker-compose.prod.yaml
+++ b/docker-compose.prod.yaml
@@ -41,7 +41,7 @@ services:
       context: .
       dockerfile: ./docker/prod/Dockerfile
       args:
-        FOLIOBLOG_VERSION: ${FOLIOBLOG_VERSION:-main}
+        FOLIOBLOG_RELEASE: ${FOLIOBLOG_RELEASE:-v1.7.0}
         NODE_VERSION: ${FOLIOBLOG_NODE_VERSION:-v20.10.0}
         MEDIA_ROOT: ${FOLIOBLOG_MEDIA_ROOT}
         STATIC_ROOT: ${FOLIOBLOG_STATIC_ROOT}
diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile
index 49b4990..3c09b4c 100644
--- a/docker/prod/Dockerfile
+++ b/docker/prod/Dockerfile
@@ -1,7 +1,7 @@
 # Use the default Python image to have more reposities availables.
 FROM python:3.10-slim
 
-ARG FOLIOBLOG_VERSION
+ARG FOLIOBLOG_RELEASE
 ARG NODE_VERSION
 ARG MEDIA_ROOT
 ARG STATIC_ROOT
@@ -23,8 +23,7 @@ RUN apt update --yes --quiet && apt install --yes --quiet --no-install-recommend
     wget \
     curl \
     tar \
-    xz-utils \
-    git
+    xz-utils
 
 # Then install nodeJS with NPM.
 RUN wget -O /opt/node.tar.xz https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-linux-x64.tar.xz
@@ -35,9 +34,12 @@ RUN rm /opt/node.tar.xz
 # Create an app user.
 RUN useradd --create-home --shell /bin/bash appuser
 
-# Fetch source code. For now, using GIT but later, better to download release tarball.
-RUN git clone --depth=1 --branch=${FOLIOBLOG_VERSION} https://github.com/ychab/wagtail_folioblog.git /app
+# Fetch source code from GitHub archives.
+RUN mkdir /app
+RUN wget -O /app/folioblog.tar.gz https://github.com/ychab/wagtail_folioblog/archive/refs/tags/${FOLIOBLOG_RELEASE}.tar.gz
+RUN tar xzf /app/folioblog.tar.gz -C /app/ --no-same-owner --strip-components=1
 RUN chown -R appuser:appuser /app
+RUN rm /app/folioblog.tar.gz
 
 # Create virtualenv and install backend dependencies with gunicorn.
 RUN python -m venv ${VIRTUAL_ENV}
diff --git a/env/.env.LOCAL b/env/.env.LOCAL
index 3196d61..5ef67fa 100644
--- a/env/.env.LOCAL
+++ b/env/.env.LOCAL
@@ -61,7 +61,7 @@ FOLIOBLOG_REDIS_PASSWORD=redis
 # PRODUCTION
 ############
 
-# FOLIOBLOG_VERSION=main
+# FOLIOBLOG_RELEASE=v1.7.0
 # FOLIOBLOG_STATIC_ROOT=/app/static
 
 # FOLIOBLOG_NGINX_HOST=folio.local blog.folio.local demo.folio.local
diff --git a/package.json b/package.json
index 825d938..e58bcea 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "folioblog",
-  "version": "1.5.0",
+  "version": "1.7.0",
   "author": "Yannick Chabbert",
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.4.2",
diff --git a/pyproject.toml b/pyproject.toml
index a7cad55..eb71389 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "folioblog"
-version = "1.5.0"
+version = "1.7.0"
 description = "A PortFolio/Blog website build with the CMS Wagtail"
 authors = ["Yannick Chabbert <yannick.chabbert.it@gmail.com>"]
 license = "MIT"