docker: Move all Dockerfiles in a contained directory (#187)

livepeer · Aug 17, 2022 · 5634df7 · 5634df7
1 parent dd9b420
commit 5634df7
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 8 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -3,3 +3,4 @@
 /segmented
 /hls
 /hls2
+docker/
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -60,7 +60,7 @@ jobs:
           build-args: |
             version=${{ github.ref_type == 'tag' && github.ref_name || github.sha }}
           tags: ${{ steps.meta.outputs.tags }}
-          file: ${{ matrix.arrays.file }}
+          file: 'docker/${{ matrix.arrays.file }}'
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max

diff --git a/Dockerfile → docker/Dockerfile b/Dockerfile → docker/Dockerfile
diff --git a/Dockerfile.debian → docker/Dockerfile.debian b/Dockerfile.debian → docker/Dockerfile.debian
diff --git a/Dockerfile.load-tester → docker/Dockerfile.load-tester b/Dockerfile.load-tester → docker/Dockerfile.load-tester
diff --git a/Dockerfile.mist-api-connector → docker/Dockerfile.mist-api-connector b/Dockerfile.mist-api-connector → docker/Dockerfile.mist-api-connector
diff --git a/Dockerfile.orch-tester → docker/Dockerfile.orch-tester b/Dockerfile.orch-tester → docker/Dockerfile.orch-tester
@@ -1,12 +1,7 @@
-FROM golang:1.16-stretch as builder
-
-ENV PKG_CONFIG_PATH /root/compiled/lib/pkgconfig
+FROM livepeerci/build as builder
 
 RUN apt update \
-  && apt install -y wget tar build-essential pkg-config autoconf gnutls-dev git curl
-
-RUN curl -s https://raw.githubusercontent.com/livepeer/go-livepeer/5da8ff8e521c15e5828fb9dfa619daf91a091fd0/install_ffmpeg.sh \
-  | bash -
+    && apt install -yqq wget tar
 
 WORKDIR /root
 

diff --git a/Dockerfile.record-tester → docker/Dockerfile.record-tester b/Dockerfile.record-tester → docker/Dockerfile.record-tester
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,3 +3,4 @@ @@
     /segmented
     /hls
     /hls2
+    docker/