DOCKER: Take an image version num

OpenSextant · Feb 5, 2022 · 97a3c41 · 97a3c41
1 parent 709bae4
commit 97a3c41
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/python/setup.py b/python/setup.py
@@ -58,5 +58,5 @@
     packages=find_packages(exclude=['contrib', 'docs', 'tests']),
     package_data={'opensextant': ['./resources/geonames.org/*.txt', './resources/*.csv', './resources/*.cfg']},
 
-    install_requires=['pysolr>=3.9.0', 'chardet>=3.0.0', 'requests>=2.18', 'arrow>=1.1.0', 'PyGeodesy>=21.3.3']
+    install_requires=['pysolr>=3.9.0', 'chardet>=3.0.0', 'requests', 'arrow>=1.1.0', 'PyGeodesy>=21.3.3']
 )
diff --git a/script/dist-docker-offline.sh b/script/dist-docker-offline.sh
@@ -49,6 +49,10 @@ REPO=maven-repo
 echo "              Xponents Docker Offline         "
 echo "=============================================="
 
+echo "Version Number of Image"
+read IMG_VERSION
+
+
 # CORE
 echo "++++++++++++++++ CORE ++++++++++++++++"
 (cd Core && mvn install -Dmaven.repo.local=../$REPO)
@@ -111,4 +115,4 @@ done
 # Docker
 echo "++++++++++++++++ DOCKER / Maven Offline ++++++++++++++++"
 cd $TARGET
-docker build --tag opensextant:xponents-offline-$VERSION -f ./Dockerfile.offline .
+docker build --tag opensextant:xponents-offline-$IMG_VERSION -f ./Dockerfile.offline .
diff --git a/script/dist-docker.sh b/script/dist-docker.sh
@@ -17,6 +17,9 @@ fi
 echo "              Xponents Docker                 "
 echo "=============================================="
 
+echo "Version Number of Image"
+read IMG_VERSION
+
 cd $TARGET/
-docker build --tag opensextant:xponents-$VERSION .
+docker build --tag opensextant:xponents-$IMG_VERSION .