From feaf98d528851d025730b4f220e36f14ff5c29c7 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 12 Jan 2021 09:47:13 +0100 Subject: Remove docker images I can't maintain --- support/docker/dev/Dockerfile | 46 --------------------------------- support/docker/dev/setup_postgres.sql | 6 ----- support/docker/dev/usage.md | 20 -------------- support/docker/janitor/Dockerfile | 33 ----------------------- support/docker/janitor/create_user.sql | 3 --- support/docker/janitor/janitor.json | 42 ------------------------------ support/docker/janitor/supervisord.conf | 3 --- 7 files changed, 153 deletions(-) delete mode 100644 support/docker/dev/Dockerfile delete mode 100644 support/docker/dev/setup_postgres.sql delete mode 100644 support/docker/dev/usage.md delete mode 100644 support/docker/janitor/Dockerfile delete mode 100644 support/docker/janitor/create_user.sql delete mode 100644 support/docker/janitor/janitor.json delete mode 100644 support/docker/janitor/supervisord.conf diff --git a/support/docker/dev/Dockerfile b/support/docker/dev/Dockerfile deleted file mode 100644 index e41f5e1e2..000000000 --- a/support/docker/dev/Dockerfile +++ /dev/null @@ -1,46 +0,0 @@ -FROM ubuntu:bionic - -# Avoid tzdata interactive dialog -ENV DEBIAN_FRONTEND=noninteractive - -# Install PeerTube's dependencies. -# Packages are from https://github.com/Chocobozzz/PeerTube#dependencies -RUN apt-get update -q && apt-get install -qy \ - curl \ - ffmpeg \ - g++ \ - git \ - gnupg \ - make \ - nano \ - openssl \ - postgresql \ - postgresql-contrib \ - redis-server \ - && curl -sL https://deb.nodesource.com/setup_10.x | bash - \ - && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ - && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ - && apt-get update \ - && apt-get install -qy nodejs yarn \ - && rm -rf /var/lib/apt/lists/* - -# Download PeerTube's source code. -RUN git clone -b develop https://github.com/Chocobozzz/PeerTube /home/user/PeerTube -WORKDIR /home/user/PeerTube - -# Copy postgresql setup script -COPY setup_postgres.sql /tmp/ - -# Install Node.js dependencies and setup PostgreSQL -RUN yarn install --pure-lockfile \ - && service postgresql start \ - && su postgres -c "psql --file=/tmp/setup_postgres.sql" - -# Expose PeerTube sources as a volume -VOLUME /home/user/PeerTube - -# Expose frontend, API and RTMP -EXPOSE 3000 9000 1935 - -# Start PostgreSQL and Redis -CMD ["service postgresql start && redis-server"] diff --git a/support/docker/dev/setup_postgres.sql b/support/docker/dev/setup_postgres.sql deleted file mode 100644 index 0937f9d19..000000000 --- a/support/docker/dev/setup_postgres.sql +++ /dev/null @@ -1,6 +0,0 @@ -create database peertube_dev; -create user peertube password 'peertube'; -grant all privileges on database peertube_dev to peertube; -\c peertube_dev -CREATE EXTENSION pg_trgm; -CREATE EXTENSION unaccent; diff --git a/support/docker/dev/usage.md b/support/docker/dev/usage.md deleted file mode 100644 index 319d7db30..000000000 --- a/support/docker/dev/usage.md +++ /dev/null @@ -1,20 +0,0 @@ -### Usage -1. Build the image: - ``` - docker build -t my_peertube_dev . - ``` -1. Start the container: - ``` - docker run -d -i -p 3000:3000 -p 9000:9000 --name peertube my_peertube_dev - ``` - This will create a new Docker volume containing PeerTube sources. - -1. Start PeerTube inside the container: - ``` - docker exec -it peertube npm run dev - ``` -1. In another window, find the path to the Docker volume - ``` - docker inspect peertube | less +/Mounts - ``` - You can now make changes to the files. They should be automatically recompiled. diff --git a/support/docker/janitor/Dockerfile b/support/docker/janitor/Dockerfile deleted file mode 100644 index 5e7970d17..000000000 --- a/support/docker/janitor/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -FROM janitortechnology/ubuntu-dev - -# Install PeerTube's dependencies. -# Packages are from https://github.com/Chocobozzz/PeerTube#dependencies -RUN sudo apt-get update -q && sudo apt-get install -qy \ - ffmpeg \ - postgresql \ - openssl - -# Download PeerTube's source code. -RUN git clone -b develop https://github.com/Chocobozzz/PeerTube /home/user/PeerTube -WORKDIR /home/user/PeerTube - -# Configure the IDEs to use Janitor's source directory as workspace. -ENV WORKSPACE /home/user/PeerTube/ - -# Install dependencies. -RUN yarn install --pure-lockfile - -# Configure Janitor for PeerTube. -COPY --chown=user:user janitor.json /home/user/ - -# Configure and build PeerTube. -COPY create_user.sql /tmp/ -RUN sudo service postgresql start \ - && sudo -u postgres psql --file=/tmp/create_user.sql \ - && npm run build - -COPY --chown=user:user supervisord.conf /tmp/supervisord-extra.conf -RUN cat /tmp/supervisord-extra.conf | sudo tee -a /etc/supervisord.conf - -# Expose frontend, API and RTMP -EXPOSE 3000 9000 1935 diff --git a/support/docker/janitor/create_user.sql b/support/docker/janitor/create_user.sql deleted file mode 100644 index c2fbcf27e..000000000 --- a/support/docker/janitor/create_user.sql +++ /dev/null @@ -1,3 +0,0 @@ -create database peertube_dev; -create user peertube password 'peertube'; -grant all privileges on database peertube_dev to peertube; diff --git a/support/docker/janitor/janitor.json b/support/docker/janitor/janitor.json deleted file mode 100644 index 5acdf3060..000000000 --- a/support/docker/janitor/janitor.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "name": "PeerTube", - "description": "Federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.", - "icon": "https://janitor.technology/img/peertube.svg", - "docker": { - "image": "chocobozzz/peertube-dev" - }, - "ports": { - "22": { - "label": "SSH", - "proxy": "none" - }, - "3000": { - "label": "PeerTube web app", - "proxy": "https", - "preview": true - }, - "8088": { - "label": "VNC", - "proxy": "https" - }, - "8089": { - "label": "Cloud9", - "proxy": "https" - }, - "8090": { - "label": "Theia", - "proxy": "https" - }, - "9000": { - "label": "PeerTube API", - "proxy": "https" - } - }, - "scripts": { - "Start PeerTube": "npm run dev", - "Build PeerTube": "npm run build", - "Run tests": "npm test", - "Update source code": "git pull --rebase origin", - "Send to code review": "hub pull-request" - } -} diff --git a/support/docker/janitor/supervisord.conf b/support/docker/janitor/supervisord.conf deleted file mode 100644 index b2e1682df..000000000 --- a/support/docker/janitor/supervisord.conf +++ /dev/null @@ -1,3 +0,0 @@ -[program:postgresql] -user = user -command = sudo -u postgres /usr/lib/postgresql/9.5/bin/postgres -D /var/lib/postgresql/9.5/main -c config_file=/etc/postgresql/9.5/main/postgresql.conf -- cgit v1.2.3