Pull request fixes for codacy.

pull/21/head
Andrew Killer 5 years ago
parent eafe97a29d
commit 4188ed2ced
  1. 2
      .gitattributes
  2. 4
      Dockerfile
  3. 8
      README.md

2
.gitattributes vendored

@ -1 +1 @@
*.sh text eol=lf *.sh text eol=lf

@ -9,7 +9,7 @@ ARG ANDROID_API_LEVEL=29
WORKDIR /build WORKDIR /build
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y \ apt-get install -y --no-install-recommends \
autoconf \ autoconf \
automake \ automake \
build-essential \ build-essential \
@ -47,4 +47,4 @@ COPY sources ./sources
COPY ffmpeg-android-maker.sh ./ COPY ffmpeg-android-maker.sh ./
RUN chmod +x ./ffmpeg-android-maker.sh RUN chmod +x ./ffmpeg-android-maker.sh
ENTRYPOINT ["./ffmpeg-android-maker.sh"] ENTRYPOINT ["./ffmpeg-android-maker.sh"]

@ -42,16 +42,18 @@ Docker can be used to build the project without the need to install any build de
The build output is copied to /build/build. This should be mounted to a folder on the host machine to access. The build output is copied to /build/build. This should be mounted to a folder on the host machine to access.
1. Build the image. You only need to do this once unless you need to change SDK/NDK versions: 1. Build the image. You only need to do this once unless you need to change SDK/NDK versions:
```sh ```sh
docker build --rm --tag ffmpeg-android-maker:latest . docker build --rm --tag ffmpeg-android-maker:latest .
``` ```
2. Run the container. This will download ffmpeg, build it, then copy to /build/build:
2. Run the container. This will download ffmpeg, build it, then copy to /build/build:
```sh ```sh
docker container run --rm --name ffmpeg-android-maker -v /path/to/host/output:/build/build ffmpeg-android-maker docker container run --rm --name ffmpeg-android-maker -v /path/to/host/output:/build/build ffmpeg-android-maker
``` ```
On Windows you can pass in a host path in the following way: On Windows you can pass in a host path in the following way:
``` ```sh
-v C:\path\to\host\output:/build/build -v C:\path\to\host\output:/build/build
``` ```

Loading…
Cancel
Save