Skip to content

Commit 97a3c41

Browse files
committed
DOCKER: Take an image version num
1 parent 709bae4 commit 97a3c41

3 files changed

Lines changed: 10 additions & 3 deletions

File tree

python/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,5 @@
5858
packages=find_packages(exclude=['contrib', 'docs', 'tests']),
5959
package_data={'opensextant': ['./resources/geonames.org/*.txt', './resources/*.csv', './resources/*.cfg']},
6060

61-
install_requires=['pysolr>=3.9.0', 'chardet>=3.0.0', 'requests>=2.18', 'arrow>=1.1.0', 'PyGeodesy>=21.3.3']
61+
install_requires=['pysolr>=3.9.0', 'chardet>=3.0.0', 'requests', 'arrow>=1.1.0', 'PyGeodesy>=21.3.3']
6262
)

script/dist-docker-offline.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ REPO=maven-repo
4949
echo " Xponents Docker Offline "
5050
echo "=============================================="
5151

52+
echo "Version Number of Image"
53+
read IMG_VERSION
54+
55+
5256
# CORE
5357
echo "++++++++++++++++ CORE ++++++++++++++++"
5458
(cd Core && mvn install -Dmaven.repo.local=../$REPO)
@@ -111,4 +115,4 @@ done
111115
# Docker
112116
echo "++++++++++++++++ DOCKER / Maven Offline ++++++++++++++++"
113117
cd $TARGET
114-
docker build --tag opensextant:xponents-offline-$VERSION -f ./Dockerfile.offline .
118+
docker build --tag opensextant:xponents-offline-$IMG_VERSION -f ./Dockerfile.offline .

script/dist-docker.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ fi
1717
echo " Xponents Docker "
1818
echo "=============================================="
1919

20+
echo "Version Number of Image"
21+
read IMG_VERSION
22+
2023
cd $TARGET/
21-
docker build --tag opensextant:xponents-$VERSION .
24+
docker build --tag opensextant:xponents-$IMG_VERSION .
2225

0 commit comments

Comments
 (0)