diff --git a/.gitattributes b/.gitattributes index 526c8a3..dfdb8b7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -*.sh text eol=lf \ No newline at end of file +*.sh text eol=lf diff --git a/Dockerfile b/Dockerfile index 82dec00..3f36d62 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ARG ANDROID_API_LEVEL=29 WORKDIR /build RUN apt-get update && \ - apt-get install -y \ + apt-get install -y --no-install-recommends \ autoconf \ automake \ build-essential \ @@ -47,4 +47,4 @@ COPY sources ./sources COPY ffmpeg-android-maker.sh ./ RUN chmod +x ./ffmpeg-android-maker.sh -ENTRYPOINT ["./ffmpeg-android-maker.sh"] \ No newline at end of file +ENTRYPOINT ["./ffmpeg-android-maker.sh"] diff --git a/README.md b/README.md index e4a1130..13afb4a 100644 --- a/README.md +++ b/README.md @@ -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. -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 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 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: - ``` + ```sh -v C:\path\to\host\output:/build/build ```