Optimize docker files layout

OdyseeTeam · Feb 19, 2024 · a48a9f3 · a48a9f3
1 parent 7c244e3
commit a48a9f3
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 32 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -13,7 +13,16 @@ jobs:
     name: Test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          path: 'doco'
+          fetch-depth: 0
+      - run: |
+          cd doco &&
+          docker-compose up -d minio db redis &&
+          docker-compose up -d cworker conductor &&
+          docker-compose up minio-prepare
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: actions/setup-go@v3
@@ -24,4 +33,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 ./...
diff --git a/Dockerfile.test b/Dockerfile.test
diff --git a/Makefile b/Makefile
@@ -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

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -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

diff --git a/Dockerfile-conductor → docker/Dockerfile-conductor b/Dockerfile-conductor → docker/Dockerfile-conductor
diff --git a/Dockerfile-cworker → docker/Dockerfile-cworker b/Dockerfile-cworker → docker/Dockerfile-cworker
diff --git a/Dockerfile-ffmpeg → docker/Dockerfile-ffmpeg b/Dockerfile-ffmpeg → docker/Dockerfile-ffmpeg
diff --git a/Dockerfile-ffprobe → docker/Dockerfile-ffprobe b/Dockerfile-ffprobe → docker/Dockerfile-ffprobe
diff --git a/Dockerfile-tccli → docker/Dockerfile-tccli b/Dockerfile-tccli → docker/Dockerfile-tccli