Merge pull request #54 from dev-lymar/develop-docker

✅ | Delete docker directory

.dockerignore

@@ -29,9 +29,9 @@ pip-wheel-metadata/
 .eggs/
 
 # Exclude Docker Compose files (if not needed inside the container)
-docker/docker-compose.yml
-docker/docker-compose.dev.yml
-docker/docker-compose.prod.yml
+docker-compose.yml
+docker-compose.dev.yml
+docker-compose.prod.yml
 
 # Exclude various images and pictures if they are not required for assembly
 img/

.github/workflows/main.yml

@@ -35,8 +35,6 @@ jobs:
       - name: Build and push Docker image
         uses: docker/build-push-action@v3
         with:
-          context: ./docker
-          file: ./docker/Dockerfile
           push: true
           tags: ${{ secrets.DOCKER_USERNAME }}/hamster_bot:v1.8.5
 

docker/Dockerfile.dev → Dockerfile.dev

@@ -4,9 +4,9 @@ RUN apt-get update && apt-get install -y postgresql-client && rm -rf /var/lib/ap
 
 WORKDIR /hamster
 
-COPY ../requirements-dev.txt requirements-dev.txt
+COPY requirements-dev.txt requirements-dev.txt
 
 RUN pip install --upgrade pip \
  && pip install -r requirements-dev.txt
 
-COPY .. .
+COPY . .

Makefile

@@ -11,10 +11,10 @@ run_bot:
 	python3 -m bot.main
 
 run_dev_db_docker:
-	docker-compose -f ./docker/docker-compose.yml -f ./docker/docker-compose.dev.yml --env-file .env.prod up postgres redis
+	docker-compose -f docker-compose.yml -f docker-compose.dev.yml --env-file .env.prod up postgres redis
 
 run_dev_bot_docker:
-	docker-compose -f ./docker/docker-compose.yml -f ./docker/docker-compose.dev.yml --env-file .env.prod up bot
+	docker-compose -f docker-compose.yml -f docker-compose.dev.yml --env-file .env.prod up bot
 
 prod-up:
 	docker-compose -f docker-compose.yml -f docker-compose.prod.yml --env-file .env.prod up -d

docker/docker-compose.dev.yml → docker-compose.dev.yml

@@ -1,10 +1,10 @@
 services:
   app:
     build:
-      context: ../
-      dockerfile: ./docker/Dockerfile.dev
+      context: .
+      dockerfile: Dockerfile.dev
     env_file:
-      - ../.env.dev
+      - .env.dev
     volumes:
       - .:/hamster
     command: python3 -m app.main
@@ -16,13 +16,13 @@ services:
 
   bot:
     build:
-      context: ../
-      dockerfile: ./docker/Dockerfile.dev
+      context: .
+      dockerfile: Dockerfile.dev
     env_file:
-      - ../.env.dev
+      - .env.dev
     volumes:
-      - ../:/hamster
-      - ../images_data:/hamster/bot/images
+      - .:/hamster
+      - ./images_data:/hamster/bot/images
     command: python3 -m bot.main
     depends_on:
       - postgres