Skip to content

Commit

Permalink
Merge pull request #5 from ajatoledo/master
Browse files Browse the repository at this point in the history
updated libjpeg8-dev to libjpeg-dev
  • Loading branch information
meinside authored Jan 3, 2023
2 parents 18d5071 + b44d7bd commit 031a8da
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ WORKDIR /

# install packages
RUN apt-get update -y && \
apt-get install -y build-essential libjpeg8-dev imagemagick libv4l-dev git cmake uvcdynctrl libraspberrypi-bin
apt-get install -y build-essential libjpeg-dev imagemagick libv4l-dev git cmake uvcdynctrl libraspberrypi-bin

# build mjpg-streamer
RUN ln -s /usr/include/linux/videodev2.h /usr/include/linux/videodev.h && \
Expand Down
54 changes: 54 additions & 0 deletions Dockerfile-QEMU-ARM
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# Dockerfile for rpi-mjpg-streamer

# https://www.balena.io/docs/reference/base-images/base-images-ref/
ARG RPI=raspberrypi3

FROM balenalib/$RPI-debian:latest

COPY ./Docker/qemu-arm-* /usr/bin/

WORKDIR /

# install packages
RUN apt-get update -y && \
apt-get install -y build-essential libjpeg-dev imagemagick libv4l-dev git cmake uvcdynctrl libraspberrypi-bin

# build mjpg-streamer
RUN ln -s /usr/include/linux/videodev2.h /usr/include/linux/videodev.h && \
git clone https://github.com/jacksonliam/mjpg-streamer && \
cd mjpg-streamer/mjpg-streamer-experimental && \
cmake -DCMAKE_INSTALL_PREFIX:PATH=.. . && \
make install

# copy rpi-mjpg-streamer files
COPY ./ /

# arguments (default values in `.env` file)
ARG PORT
ARG RESOLUTION
ARG FPS
ARG ANGLE
ARG FLIPPED
ARG MIRRORED
ARG USERNAME
ARG PASSWORD

# environtment variables
ENV PORT=${PORT} \
RESOLUTION=${RESOLUTION} \
FPS=${FPS} \
ANGLE=${ANGLE} \
FLIPPED=${FLIPPED} \
MIRRORED=${MIRRORED} \
USERNAME=${USERNAME} \
PASSWORD=${PASSWORD}

# configure
RUN echo "{'angle': ${ANGLE}, 'flipped': ${FLIPPED}, 'mirrored': ${MIRRORED}}" \
> /www/config.json

# Open ports
EXPOSE $PORT

# Entry point for the built application
ENTRYPOINT ["/run-mjpg-streamer.docker.sh"]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ $ sudo raspi-config

```bash
$ sudo apt-get update
$ sudo apt-get install build-essential libjpeg8-dev imagemagick libv4l-dev git cmake uvcdynctrl
$ sudo apt-get install build-essential libjpeg-dev imagemagick libv4l-dev git cmake uvcdynctrl
```

### Build mjpg-streamer
Expand Down

0 comments on commit 031a8da

Please sign in to comment.