aboutsummaryrefslogtreecommitdiff
path: root/docker/crupest-debian-dev
diff options
context:
space:
mode:
authorcrupest <crupest@outlook.com>2024-08-14 00:28:12 +0800
committercrupest <crupest@outlook.com>2024-08-14 23:10:20 +0800
commit874dce759fefc094ed3d51e9d350f424ac65a94a (patch)
treeb3b0fc69c00c9ab3f557ed4ea39699d1d8e49bbc /docker/crupest-debian-dev
parent61cd7dabdd2c5272a952edd40dffcbc368b596b1 (diff)
downloadcrupest-874dce759fefc094ed3d51e9d350f424ac65a94a.tar.gz
crupest-874dce759fefc094ed3d51e9d350f424ac65a94a.tar.bz2
crupest-874dce759fefc094ed3d51e9d350f424ac65a94a.zip
feat(docker/debian-dev): add data/state mount dir, fix debian version.
Diffstat (limited to 'docker/crupest-debian-dev')
-rw-r--r--docker/crupest-debian-dev/Dockerfile2
-rwxr-xr-xdocker/crupest-debian-dev/bootstrap/apt-source/setup.bash2
-rwxr-xr-xdocker/crupest-debian-dev/bootstrap/get-debian-version.bash2
-rwxr-xr-xdocker/crupest-debian-dev/bootstrap/setup-base.bash5
4 files changed, 8 insertions, 3 deletions
diff --git a/docker/crupest-debian-dev/Dockerfile b/docker/crupest-debian-dev/Dockerfile
index 1ac4acd..3293f03 100644
--- a/docker/crupest-debian-dev/Dockerfile
+++ b/docker/crupest-debian-dev/Dockerfile
@@ -17,5 +17,5 @@ USER ${USER}
WORKDIR /home/${USER}
EXPOSE 8080
-VOLUME [ "/data" ]
+VOLUME [ "/data", "/state" ]
CMD [ "bash", "-l" ]
diff --git a/docker/crupest-debian-dev/bootstrap/apt-source/setup.bash b/docker/crupest-debian-dev/bootstrap/apt-source/setup.bash
index 6e504ef..cb3d3e4 100755
--- a/docker/crupest-debian-dev/bootstrap/apt-source/setup.bash
+++ b/docker/crupest-debian-dev/bootstrap/apt-source/setup.bash
@@ -5,7 +5,7 @@ set -e
dir=/bootstrap/apt-source
echo "Getting debian version..."
-debian_version=$(bash "$dir/../get-debian-version.bash")
+debian_version=$("$dir/../get-debian-version.bash")
if [[ -z $debian_version ]]; then
echo "Debian version not found."
diff --git a/docker/crupest-debian-dev/bootstrap/get-debian-version.bash b/docker/crupest-debian-dev/bootstrap/get-debian-version.bash
index 305e628..9cd468a 100755
--- a/docker/crupest-debian-dev/bootstrap/get-debian-version.bash
+++ b/docker/crupest-debian-dev/bootstrap/get-debian-version.bash
@@ -6,6 +6,6 @@ if [ -f /etc/os-release ]; then
echo "$VERSION_ID"
exit 0
fi
-else
+fi
exit 1
diff --git a/docker/crupest-debian-dev/bootstrap/setup-base.bash b/docker/crupest-debian-dev/bootstrap/setup-base.bash
index e918a8b..6a715c7 100755
--- a/docker/crupest-debian-dev/bootstrap/setup-base.bash
+++ b/docker/crupest-debian-dev/bootstrap/setup-base.bash
@@ -15,6 +15,11 @@ echo "Setting up locale..."
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
echo "Setting up locale done."
+echo "Creating data/state dir..."
+mkdir -p /data /state
+chown $CRUPEST_DEBIAN_DEV_USER:$CRUPEST_DEBIAN_DEV_USER /data /state
+echo "Creating data dir done."
+
append-bash-profile bash-completion.bash
echo "Setting up basic system function done."