diff options
| -rw-r--r-- | docker/crupest-debian-dev/Dockerfile | 2 | ||||
| -rwxr-xr-x | docker/crupest-debian-dev/bootstrap/setup-base.bash | 6 | ||||
| -rw-r--r-- | template/docker-compose.yaml.template | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/docker/crupest-debian-dev/Dockerfile b/docker/crupest-debian-dev/Dockerfile index 3293f03..95f0602 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", "/state" ] +VOLUME [ "/data", "/home/${USER}" ] CMD [ "bash", "-l" ] diff --git a/docker/crupest-debian-dev/bootstrap/setup-base.bash b/docker/crupest-debian-dev/bootstrap/setup-base.bash index 5a68b9f..31ded36 100755 --- a/docker/crupest-debian-dev/bootstrap/setup-base.bash +++ b/docker/crupest-debian-dev/bootstrap/setup-base.bash @@ -15,9 +15,9 @@ 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..." +mkdir -p /data +chown $CRUPEST_DEBIAN_DEV_USER:$CRUPEST_DEBIAN_DEV_USER /data echo "Creating data dir done." append-bashrc bash-completion.bash diff --git a/template/docker-compose.yaml.template b/template/docker-compose.yaml.template index 04f5b51..678a7e4 100644 --- a/template/docker-compose.yaml.template +++ b/template/docker-compose.yaml.template @@ -151,6 +151,8 @@ services: context: ./docker/crupest-debian-dev dockerfile: Dockerfile pull: true + args: + - USER=crupest tags: - "crupest/debian-dev:latest" container_name: debian-dev @@ -159,8 +161,8 @@ services: restart: on-failure:3 volumes: - ./data/debian-dev:/data - - debian-dev-state:/state + - debian-dev-home:/home/crupest volumes: blog-public: - debian-dev-state: + debian-dev-home: |