Optimize docker files layout

Author: anbsky

.github/workflows/test.yaml

@@ -13,9 +13,13 @@ jobs:
     name: Test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+      - run: |
+          docker-compose up -d minio db redis &&
+          docker-compose up -d cworker conductor &&
+          docker-compose up minio-prepare
       - uses: actions/setup-go@v3
         with:
           go-version: '1.20.x'
@@ -24,4 +28,4 @@ jobs:
         uses: FedericoCarboni/setup-ffmpeg@v1-beta
         id: setup-ffmpeg
       - name: Run tests
-        run: make test
+        run: go test -covermode=count -coverprofile=coverage.out ./...

Dockerfile.test

@@ -16,10 +16,10 @@ transcoder: $(BUILD_DIR)/$(GOOS)_$(GOARCH)/transcoder
 	  ./pkg/conductor/cmd/
 
 conductor_image:
-	docker buildx build -f Dockerfile-conductor -t odyseeteam/transcoder-conductor:$(TRANSCODER_VERSION) --platform linux/amd64 .
+	docker buildx build -f docker/Dockerfile-conductor -t odyseeteam/transcoder-conductor:$(TRANSCODER_VERSION) --platform linux/amd64 .
 
 cworker_image:
-	docker buildx build -f Dockerfile-cworker -t odyseeteam/transcoder-cworker:$(TRANSCODER_VERSION) --platform linux/amd64 .
+	docker buildx build -f docker/Dockerfile-cworker -t odyseeteam/transcoder-cworker:$(TRANSCODER_VERSION) --platform linux/amd64 .
 
 test_down:
 	docker-compose down
@@ -30,7 +30,7 @@ test_prepare:
 	docker-compose up minio-prepare
 
 test: test_prepare
-	go test -exclude="docker-data" -covermode=count -coverprofile=coverage.out ./...
+	go test -covermode=count -coverprofile=coverage.out ./...
 
 towerz:
 	docker run --rm -v "$(PWD)":/usr/src/transcoder -w /usr/src/transcoder --platform linux/amd64 golang:1.16.10 make tower

Makefile

@@ -15,7 +15,7 @@ services:
       - "8080:8080"
     # build:
     #   context: .
-    #   dockerfile: Dockerfile-tower
+    #   dockerfile: docker/Dockerfile-tower
     depends_on:
       - redis
       - db
@@ -35,7 +35,7 @@ services:
       - --blob-server=blobcache-eu.lbry.com
     # build:
     #   context: .
-    #   dockerfile: Dockerfile-worker
+    #   dockerfile: docker/Dockerfile-worker
     depends_on: ["redis"]
     volumes:
       - ${PWD}/worker.ex.yml:/app/worker.yml
@@ -52,7 +52,7 @@ services:
     ports:
       - '6379:6379'
     volumes:
-      - ./docker-data/redis:/data
+      - redis-data:/data
     command: >
       --requirepass odyredis --appendonly yes
     labels:
@@ -66,7 +66,7 @@ services:
     environment:
       POSTGRES_PASSWORD: odyseeteam
     volumes:
-      - ./docker-data/postgres:/var/lib/postgresql/data
+      - db-data:/var/lib/postgresql/data
     command:
       - -clogging_collector=on
       - -clog_statement=all
@@ -84,15 +84,15 @@ services:
       - "38861:38861"
       - "41949:41949"
     volumes:
-      - ./docker-data/minio:/data
+      - minio-data:/data
     environment:
       MINIO_ROOT_USER: ody
       MINIO_ROOT_PASSWORD: odyseetes3
     command: server --address 0.0.0.0:9000 /data
   minio-prepare:
     image: minio/mc
     volumes:
-      - ./docker-data/minio:/data
+      - minio-data:/data
     entrypoint: >
       /bin/sh -c "
       /usr/bin/mc config host add myminio http://minio:9000 ody odyseetes3;
@@ -102,3 +102,9 @@ services:
       exit 0;
       "
     depends_on: ["minio"]
+
+volumes:
+
+  db-data:
+  minio-data:
+  redis-data: