chore: move files

tristiisch · Sep 30, 2024 · 571d7ed · 571d7ed
1 parent 62f29b2
commit 571d7ed
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 10 deletions.
diff --git a/Dockerfile → .docker/Dockerfile b/Dockerfile → .docker/Dockerfile
diff --git a/docker-compose.dev.yml → .docker/docker-compose.dev.yml b/docker-compose.dev.yml → .docker/docker-compose.dev.yml
diff --git a/docker-compose.preprod.yml → .docker/docker-compose.preprod.yml b/docker-compose.preprod.yml → .docker/docker-compose.preprod.yml
diff --git a/docker-compose.prod.yml → .docker/docker-compose.prod.yml b/docker-compose.prod.yml → .docker/docker-compose.prod.yml
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -10,8 +10,7 @@ on:
       - "src/**/*.py"
       - "requirements.txt"
       - ".dockerignore"
-      - "entrypoint.sh"
-      - "Dockerfile"
+      - "./.docker/Dockerfile"
       - "docker-compose*.yml"
       - ".github/workflows/python.yml"
   pull_request:
@@ -23,8 +22,7 @@ on:
       - "tests/**/*.py"
       - "requirements.txt"
       - ".dockerignore"
-      - "entrypoint.sh"
-      - "Dockerfile"
+      - "./.docker/Dockerfile"
       - "docker-compose*.yml"
       - ".github/workflows/python.yml"
   workflow_dispatch:
@@ -196,7 +194,7 @@ jobs:
         id: build
         uses: docker/build-push-action@v6
         with:
-          file: ./Dockerfile
+          file: ./.docker/Dockerfile
           target: executable
           context: .
           platforms: ${{ matrix.platform }}
@@ -244,7 +242,7 @@ jobs:
         id: build
         uses: docker/build-push-action@v6
         with:
-          file: ./Dockerfile
+          file: ./.docker/Dockerfile
           target: tests
           context: .
           tags: pyramid:tests

diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 COMPOSE_SERVICE					:=	discord
 VENV_NAME						:=	.venv
-DOCKER_COMPOSE_FILE_DEV			:=	docker-compose.dev.yml
-DOCKER_COMPOSE_FILE_PREPROD		:=	docker-compose.preprod.yml
+DOCKER_COMPOSE_FILE_DEV			:=	./.docker/docker-compose.dev.yml
+DOCKER_COMPOSE_FILE_PREPROD		:=	./.docker/docker-compose.preprod.yml
 DOCKER_SERVICE_PREPROD			:=	pyramid_preprod_pyramid
 DOCKER_CONTEXT_PREPROD			:=	cookie-pulsheberg
 
@@ -52,7 +52,7 @@ dev:
 	@docker compose -f $(DOCKER_COMPOSE_FILE_DEV) up -d --remove-orphans --pull always --force-recreate
 
 tests:
-	@docker build -f Dockerfile --target tests -t pyramid:tests .
+	@docker build -f ./.docker/Dockerfile --target tests -t pyramid:tests .
 	@mkdir -p ./coverage && chmod 777 ./coverage
 	@docker run --rm --env-file ./.env -v ./coverage:/app/coverage -it pyramid:tests
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
   discord:
     build:
-      dockerfile: ./Dockerfile
+      dockerfile: ./.docker/Dockerfile
       target: executable-dev
       context: .
     restart: no