Updated template

s4hri · Aug 5, 2021 · 8e9b651 · 8e9b651
1 parent e4eabba
commit 8e9b651
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 7 deletions.
diff --git a/.husk/Dockerfile → .docker/.husk/Dockerfile b/.husk/Dockerfile → .docker/.husk/Dockerfile
diff --git a/.version → .docker/.version b/.version → .docker/.version
diff --git a/Makefile → .docker/Makefile b/Makefile → .docker/Makefile
@@ -1,7 +1,7 @@
 LOCAL_USER_ID := $(shell id -u)
 export LOCAL_USER_ID
 
-include .env
+include ../.env
 include .version
 
 SHELL := /bin/bash
@@ -111,7 +111,7 @@ setup:
 
 init: setup
 	echo "Building project docker image ${PJT_DOCKER_IMAGE}"; \
-	docker build docker -t ${PJT_DOCKER_IMAGE} --build-arg DOCKER_SRC=${DOCKER_SRC} ${BUILD_ARGS};
+	docker build .. -t ${PJT_DOCKER_IMAGE} --build-arg DOCKER_SRC=${DOCKER_SRC} ${BUILD_ARGS};
 
 
 build:
@@ -131,8 +131,8 @@ ifneq (, ${XRANDR_CONF})
 	$(shell ${XRANDR_CONF})
 endif
 	@echo "Running docker image ${LOCAL_DOCKER_IMAGE}"
-	docker-compose -f docker-compose.yml -f docker-compose.base.yml ${NVIDIA_COMPOSE} up --remove-orphans
-	docker-compose down
+	docker-compose -f ../docker-compose.yml -f docker-compose.base.yml ${NVIDIA_COMPOSE} up --remove-orphans
+	docker-compose -f ../docker-compose.yml -f docker-compose.base.yml ${NVIDIA_COMPOSE} down
 
 distro: build
 	@echo "Pushing docker image ${PJT_DOCKER_IMAGE} on dockerhub"

diff --git a/docker-compose.base.yml → .docker/docker-compose.base.yml b/docker-compose.base.yml → .docker/docker-compose.base.yml
@@ -30,6 +30,10 @@ services:
         source: ${XDG_RUNTIME_DIR}/pulse
         target: ${XDG_RUNTIME_DIR}/pulse
 
+      - type: bind
+        source: ${XDG_RUNTIME_DIR}/dconf
+        target: ${XDG_RUNTIME_DIR}/dconf
+
       - type: bind
         source: ./workdir
         target: /home/docky/workdir

diff --git a/docker-compose.nvidia.yml → .docker/docker-compose.nvidia.yml b/docker-compose.nvidia.yml → .docker/docker-compose.nvidia.yml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -29,7 +29,7 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: write version
-        run: echo RELEASE_TAG=${{ github.event.release.tag_name }} > .version
+        run: echo RELEASE_TAG=${{ github.event.release.tag_name }} > .docker/.version
 
       - name: commit files
         run: |
@@ -44,4 +44,4 @@ jobs:
           branch: refs/heads/master
 
       - name: init build
-        run: make init build distro
+        run: cd .docker && make init build distro
diff --git a/docker/Dockerfile → Dockerfile b/docker/Dockerfile → Dockerfile
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,4 +8,4 @@ services:
     environment:
         - PROJECT_NAME=${PROJECT_NAME}
 
-    entrypoint: bash
+    command: terminator
diff --git a/docker/init.sh → init.sh b/docker/init.sh → init.sh