Skip to content

Commit

Permalink
Revert "Add protoc, protoc-gen-elixir to jammy and focal (#31)"
Browse files Browse the repository at this point in the history
This reverts commit 7d5f5fa.
  • Loading branch information
FelonEkonom committed Aug 31, 2023
1 parent e1638b8 commit 0a7cdb0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 26 deletions.
10 changes: 4 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@
[![Docker Pulls](https://img.shields.io/docker/pulls/membraneframeworklabs/docker_membrane)][membraneframeworklabs]
[![GitHub forks](https://img.shields.io/github/forks/membraneframework/docker-membrane?style=social)][github]

A Docker image based on Ubuntu, with Erlang, Elixir, Node.js, Rust and libraries necessary to test and run the [Membrane Framework].
A Docker image based on Ubuntu, with Erlang, Elixir, Node.js and libraries necessary to test and run the [Membrane Framework].

Image has been moved to [membraneframeworklabs]

## Image variants

This image comes in many flavours, based on different Ubuntu releases and package versions:

- `latest`, `jammy` - based on Ubuntu 22.04
- `focal` - based on Ubuntu 20.04
- `latest`, `focal` - based on Ubuntu 20.04
- `bionic` - based on Ubuntu 18.04, **deprecated**

## Package versions
Expand All @@ -33,7 +32,6 @@ This image comes in many flavours, based on different Ubuntu releases and packag
| libsrtp2 | - | 2.3.0 | 2.4.2 |
| libnice | - | master (833c1aa) | - |
| libmp3lame| - | 3.100 | 3.100 |
| protoc | - | 24.2 | 24.2 |


### Version selection
Expand All @@ -58,8 +56,8 @@ make build

Optionally, one can add the following variables:
* `VERSION=string`, which adds the variant tag. Set to `latest` by default.
* `FLAVOR=string`, which selects the flavor (subdirectory of this repository) to build. Set to `jammy` by default.
* `IMAGE=name`, which will override the default image name. If not specified, this is set to `membraneframeworklabs/docker_membrane`
* `FLAVOR=string`, which selects the flavor (subdirectory of this repository) to build. Set to `focal` by default.
* `IMAGE=name`, which will override the default image name. If not specified, this is set to `membrane/membrane`

## Sample usage

Expand Down
10 changes: 0 additions & 10 deletions focal/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -134,16 +134,6 @@ RUN apt-get update \
&& cd / \
&& rm -rf /tmp/*

# Protoc and elixir-protobuf plugin
# Installing protoc from a binary release to avoid ancient packages of ubuntu
RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v24.2/protoc-24.2-linux-x86_64.zip -O protoc.zip \
&& mkdir -p ~/.local/protoc/ \
&& unzip protoc.zip -d $HOME/.local/protoc \
&& rm protoc.zip \
&& echo "export PATH='$PATH:$HOME/.local/protoc/bin'" >> $HOME/.bashrc \
&& mix escript.install hex protobuf --force \
&& asdf reshim

# Dockerize
RUN wget https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-linux-amd64-v0.6.1.tar.gz \
&& tar -C /usr/local/bin -xzvf dockerize-linux-amd64-v0.6.1.tar.gz \
Expand Down
10 changes: 0 additions & 10 deletions jammy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -130,16 +130,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
&& pip install git+https://github.com/coderanger/supervisor-stdout \
&& apt-get -y clean

# Protoc and elixir-protobuf plugin
# Installing protoc from a binary release to avoid ancient packages of ubuntu
RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v24.2/protoc-24.2-linux-x86_64.zip -O protoc.zip \
&& mkdir -p ~/.local/protoc/ \
&& unzip protoc.zip -d $HOME/.local/protoc \
&& rm protoc.zip \
&& echo "export PATH='$PATH:$HOME/.local/protoc/bin'" >> $HOME/.bashrc \
&& mix escript.install hex protobuf --force \
&& asdf reshim

COPY etc /etc
COPY /etc/skel/.xinitrc /root/
COPY usr /usr
Expand Down

0 comments on commit 0a7cdb0

Please sign in to comment.