Fix docker build

Author: EltonCN

.dockerignore

@@ -1,6 +1,7 @@
-### Generated by Python package dist-packages
-
+### Generated by Python package site-packages
 
+# excluding .git by default
+.git
 
 ### from: .gitignore
 # Byte-compiled / optimized / DLL files
@@ -172,9 +173,11 @@
 ./**/*.bin
 ./**/*.pth
 ./**/*.pt
+./**/*.pkl
 
 ./**/results/
-./**/results/*
+
+./**/*.sonar
 
 
 ### from: benchmark/.gitignore
@@ -185,6 +188,11 @@ benchmark/**/*.json
 experiments/**/*.bin
 
 
+### from: experiments/toy1d_experiment1_configuration_test/.gitignore
+experiments/toy1d_experiment1_configuration_test/**/.*
+experiments/toy1d_experiment1_configuration_test/**/*\.*
+
+
 ### from: dev/.gitignore
 dev/**/*.bin
 dev/**/*.parquet
@@ -196,10 +204,7 @@ dev/**/*.pt
 dev/**/*.npz
 dev/**/*.memmap
 dev/**/*.txt
+dev/**/*.dot
+dev/**/*.svg
 
 
-./**/*.png
-./**/*.ipynb
-
-# setuptools-scm need some .git data, we can't ignore all
-.git/*

build_docker.sh

@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
 
-pip install generate-dockerignore-from-gitignore
+pip install generate-dockerignore-from-gitignore setuptools_scm
 
 generate-dockerignore
 
-VERSION=$(git describe --tags --dirty --always)
+VERSION=$(python3 -m setuptools_scm)
+DOCKER_TAG=$(echo "$VERSION" | sed 's/[^a-zA-Z0-9._-]/-/g')
 
-docker build --build-arg "VERSION=${VERSION}" -t "eltoncn/world-machine:${VERSION}" .
+docker build --build-arg "VERSION=${VERSION}" -t "eltoncn/world-machine:${DOCKER_TAG}" .