diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e3be44e94..574217ba5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,7 +32,7 @@ jobs: shell: bash run: | echo "Release ossrs/srs:$SRS_TAG" - docker build --tag ossrs/srs:$SRS_TAG trunk + docker build --tag ossrs/srs:$SRS_TAG -f trunk/Dockerfile . - name: Login docker hub uses: docker/login-action@v1 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3dd2f54be..291ee14f4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,7 @@ jobs: ################################################################ # Tests - name: Build test image - run: docker build --tag srs:test -f trunk/Dockerfile.test trunk + run: docker build --tag srs:test -f trunk/Dockerfile.test . # For utest - name: Run SRS utest run: docker run --rm srs:test bash -c 'make && ./objs/srs_utest' diff --git a/trunk/Dockerfile b/trunk/Dockerfile index 7fcb72aab..7a3e32d34 100644 --- a/trunk/Dockerfile +++ b/trunk/Dockerfile @@ -4,7 +4,7 @@ FROM ossrs/srs:dev AS build RUN yum install -y gcc make gcc-c++ patch unzip perl git # Build and install SRS. -COPY . /srs/trunk +COPY . /srs WORKDIR /srs/trunk RUN ./configure --jobs=2 && make -j2 && make install diff --git a/trunk/Dockerfile.test b/trunk/Dockerfile.test index ca41c2072..de1eb633e 100644 --- a/trunk/Dockerfile.test +++ b/trunk/Dockerfile.test @@ -4,6 +4,6 @@ FROM ossrs/srs:dev RUN yum install -y gcc make gcc-c++ patch unzip perl git # Build and install SRS. -COPY . /srs/trunk +COPY . /srs WORKDIR /srs/trunk RUN ./configure --with-utest --jobs=2 && make -j2