From c94c5504c3792f784f9112f71702bb8bf87c6166 Mon Sep 17 00:00:00 2001
From: Johann Frei <johann_frei@yahoo.de>
Date: Tue, 13 Apr 2021 13:12:43 +0200
Subject: [PATCH] Minor cleanups and fixes

---
 .../offline_01_1_2-optional_use_https.sh             | 12 ++++++------
 .../offline_02_1-install_APT_packages.sh             |  5 ++++-
 .../offline_02_2-import_Docker_images.sh             |  8 +++++---
 offline_deployment/offline_03_1-runDoccano.sh        |  2 +-
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/offline_deployment/offline_01_1_2-optional_use_https.sh b/offline_deployment/offline_01_1_2-optional_use_https.sh
index 1099de69..b15c8e7b 100755
--- a/offline_deployment/offline_01_1_2-optional_use_https.sh
+++ b/offline_deployment/offline_01_1_2-optional_use_https.sh
@@ -6,21 +6,21 @@ cd ..
 unset DIR
 
 # create certificate pair
-sudo apt-get install openssl
+sudo apt-get install -y openssl
 openssl req -new -newkey rsa:4096 -sha256 -nodes -x509 -keyout ./nginx/cert.key -out ./nginx/cert.crt \
    -subj "/C=DE/ST=Bayern/L=Augsburg/O=Universität Augsburg/OU=Misit/CN=*.informatik.uni-augsburg.de"
 
 # define cert paths inside container
-$ssl_cert="/certs/cert.crt"
-$ssl_cert_key="/certs/cert.key"
+ssl_cert="/certs/cert.crt"
+ssl_cert_key="/certs/cert.key"
 
 # edit nginx.conf
 sed -i "s|listen 80;|listen 443 ssl;\n    ssl_certificate $ssl_cert;\n    ssl_certificate_key $ssl_cert_key;|g" nginx/nginx.conf
 
 # edit nginx Dockerfile
-echo "RUN mkdir -p /certs/"                  >> nginx/Dockerfile
-echo "COPY ./nginx/cert.key /certs/cert.key" >> nginx/Dockerfile
-echo "COPY ./nginx/cert.crt /certs/cert.crt" >> nginx/Dockerfile
+echo "RUN mkdir -p /certs/"                >> nginx/Dockerfile
+echo "COPY nginx/cert.key /certs/cert.key" >> nginx/Dockerfile
+echo "COPY nginx/cert.crt /certs/cert.crt" >> nginx/Dockerfile
 
 # edit published port
 sed -i "s|- 80:80|- 443:443|g" docker-compose.prod.yml
diff --git a/offline_deployment/offline_02_1-install_APT_packages.sh b/offline_deployment/offline_02_1-install_APT_packages.sh
index 5486ba3d..6f23f226 100755
--- a/offline_deployment/offline_02_1-install_APT_packages.sh
+++ b/offline_deployment/offline_02_1-install_APT_packages.sh
@@ -8,7 +8,10 @@ unset DIR
 pdir="/offline_packages"
 abs_pdir="$(pwd)${pdir}"
 sudo mv /etc/apt/sources.list /etc/apt/sources.list.bak
-sudo sh "deb [trusted=yes] file:${abs_pdir}"
+cat <<EOF > sources.list
+deb [trusted=yes] file://${abs_pdir} ./
+EOF
+sudo mv sources.list /etc/apt/sources.list
 
 # Install APT packages
 sudo apt-get update
diff --git a/offline_deployment/offline_02_2-import_Docker_images.sh b/offline_deployment/offline_02_2-import_Docker_images.sh
index cafdabaa..58c0fb9c 100755
--- a/offline_deployment/offline_02_2-import_Docker_images.sh
+++ b/offline_deployment/offline_02_2-import_Docker_images.sh
@@ -4,9 +4,11 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $DIR
 unset DIR
 
+# Set image tag in Compose to avoid image build
 sed -i 's^dockerfile: app/Dockerfile.prod^dockerfile: app/Dockerfile.prod\n    image: doccano-app:custom^g' ../docker-compose.prod.yml
 sed -i 's^dockerfile: nginx/Dockerfile^dockerfile: nginx/Dockerfile\n    image: doccano-nginx:custom^g' ../docker-compose.prod.yml
 
-docker image import doccano-app.tar   doccano-app:custom
-docker image import doccano-nginx.tar doccano-nginx:custom
-docker image import postgres.tar      postgres:13.1-alpine
+# Load docker images
+docker image load -i doccano-app.tar
+docker image load -i doccano-nginx.tar
+docker image load -i postgres.tar
diff --git a/offline_deployment/offline_03_1-runDoccano.sh b/offline_deployment/offline_03_1-runDoccano.sh
index 5f0f1894..dec8e02e 100755
--- a/offline_deployment/offline_03_1-runDoccano.sh
+++ b/offline_deployment/offline_03_1-runDoccano.sh
@@ -4,4 +4,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $DIR
 unset DIR
 
-docker-compose -f ../docker-compose.prod.yml up -d
\ No newline at end of file
+docker-compose -f ../docker-compose.prod.yml up -d