From 352b088c97394da8588f85a56af9730f623bd445 Mon Sep 17 00:00:00 2001 From: shockrah Date: Tue, 17 May 2022 15:31:09 -0700 Subject: [PATCH] - Removing fluff * Changin author to modern namesake Some of these docker images are simply outdated and not really general purpose enough to warrant being in this repository --- Freechat/Dockerfile | 30 ------------------ freechat-pipeline/Dockerfile | 55 --------------------------------- freechat-pipeline/entrypoint.sh | 6 ---- osdev/Dockerfile | 2 +- 4 files changed, 1 insertion(+), 92 deletions(-) delete mode 100644 Freechat/Dockerfile delete mode 100644 freechat-pipeline/Dockerfile delete mode 100755 freechat-pipeline/entrypoint.sh diff --git a/Freechat/Dockerfile b/Freechat/Dockerfile deleted file mode 100644 index eae7789..0000000 --- a/Freechat/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -FROM rust:slim-buster - -# required for building rust things and grabbing node -RUN apt-get update && apt-get upgrade -y && apt-get install \ - git default-libmysqlclient-dev pkg-config \ - curl libssl-dev ca-certificates gnupg \ - -y --no-install-recommends - - -# Setup node -# grab key -RUN curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - -# add binary & source ppa -RUN echo "deb https://deb.nodesource.com/node_14.x sid main" > /etc/apt/sources.list.d/nodesource.list -RUN echo "deb-src https://deb.nodesource.com/node_14.x sid main" >> /etc/apt/sources.list.d/nodesource.list - -RUN apt-get update && apt-get install nodejs \ - -y --no-install-recommends - -# Biuld all the projects required to run -RUN git clone https://gitlab.com/shockrah/freechat /opt/freechat/ -WORKDIR /opt/freechat/ -RUN bash docker-auto-build.sh --no-cargo-cache - -# Clean up from the apt-gets and things we don't do this -RUN apt-get remove curl gnupg ca-certificates -y # will go unused in regular builds -RUN apt-get autoremove -y -RUN rm -rf /var/lib/apt/lists/* - - diff --git a/freechat-pipeline/Dockerfile b/freechat-pipeline/Dockerfile deleted file mode 100644 index 009bebf..0000000 --- a/freechat-pipeline/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -# This docker image is used for building Freechat in Gitlab pipelines -# WARN: this image uses a lot of "lazy" practices in terms of security as its -# not at all meant to be ran in a production environment. Attempts to use this -# a "production/live" are not recommended - -FROM rust:slim-buster - -# required for building rust things and grabbing node -RUN apt-get update && apt-get upgrade -y && apt-get install \ - git default-libmysqlclient-dev pkg-config \ - curl libssl-dev ca-certificates gnupg \ - python3 python3-pip \ - -y --no-install-recommends && \ - pip3 install virtualenv - -# Install virtualenv as its semi-required for python packages in freechat -# This is a (very) small goal: removing all python dependancies outside of testing -# Because frankly Rust binaries + Node BS + Python is just too awful to maintain - -# grab key -RUN curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \ - echo "deb https://deb.nodesource.com/node_14.x sid main" > /etc/apt/sources.list.d/nodesource.list && \ - echo "deb-src https://deb.nodesource.com/node_14.x sid main" >> /etc/apt/sources.list.d/nodesource.list && \ - apt-get update && apt-get install nodejs \ - -y --no-install-recommends - - -# Mysql setup -# NOTE: Keep in mind that because I'm basically throwing security out the window -# with this docker that we're mostly just using Mysql's default everything -# Later on in another script we setup a proper user to interface with sql but still, -# nothing here is to be used in prod(once again) -RUN mkdir /opt/mysql-setup && \ - curl "https://repo.mysql.com//mysql-apt-config_0.8.17-1_all.deb" \ - -o /opt/mysql-setup/mysql-apt-config_0.8.17-1_all.deb && \ - export DEBIAN_FRONTEND=noninteractive && \ - apt-get update && \ - apt-get install /opt/mysql-setup/mysql-apt-config_0.8.17-1_all.deb \ - -y --no-install-recommends && \ - apt-get update && apt-get install mysql-community-server \ - -y --no-install-recommends - - - - -# NOTE Before we remove things we don't need we have to first mark nodejs python3-pip -RUN apt-mark hold python3-pip nodejs && \ - apt-get remove curl gnupg -y && apt-get autoremove -y && \ - rm -rf /var/lib/apt/lists/* - -# The entrypoint script not only starts the mysql service for us but it also gives -# us a shell to run commands in -COPY entrypoint.sh /entrypoint.sh -ENTRYPOINT ["/entrypoint.sh"] - diff --git a/freechat-pipeline/entrypoint.sh b/freechat-pipeline/entrypoint.sh deleted file mode 100755 index 42448c6..0000000 --- a/freechat-pipeline/entrypoint.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - - -# Basically just yeet this to the back because we don't exactly care about it -mysqld --user=root --daemonize > /dev/null 2>&1 & -bash diff --git a/osdev/Dockerfile b/osdev/Dockerfile index 2dcc358..0fa2c26 100644 --- a/osdev/Dockerfile +++ b/osdev/Dockerfile @@ -1,5 +1,5 @@ FROM debian:10 -MAINTAINER Alejandro Santillana alejandros714@protonmail.com +MAINTAINER dev@shockrah.xyz RUN apt-get update RUN apt-get upgrade -y