Small fixes + WTFPLv2

Initial docker sandbox
Apache fix
2022-07-04 23:53:39 +08:00 · 2022-07-04 23:25:31 +08:00 · 2022-07-04 23:24:43 +08:00 · 2022-07-04 23:24:27 +08:00 · 2022-07-04 22:23:44 +08:00 · 2022-07-04 22:22:57 +08:00
10 changed files with 149 additions and 90 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -0,0 +1,4 @@
+.git
+.gitignore
+.dockerignore
+README.md
--- a/27
+++ b/27
@@ -0,0 +1,27 @@
+FROM ubuntu:22.04
+
+RUN apt update && \
+    apt -y install \
+        apt-transport-https \
+        apt-utils \
+        bsdmainutils \
+        curl \
+        dialog \
+        grep \
+        make \
+        man \
+        sudo \
+        wget
+
+RUN adduser ivan \
+    --quiet \
+    --home=/home/ivan \
+    --ingroup=sudo \
+    --disabled-password \
+    --disabled-login
+
+COPY ./ /home/ivan/my-env
+RUN echo "ivan ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
+
+USER ivan
+WORKDIR /home/ivan/my-env
--- a/13
+++ b/13
@@ -0,0 +1,13 @@
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
+
+ Copyright (C) 2022 Антон Аксенов <anthonyaxenov@gmail.com>
+
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. You just DO WHAT THE FUCK YOU WANT TO.
--- a/7
+++ b/7
@@ -1,7 +1,8 @@
-# Autogenerated at 04.07.2022 22:11 using ./gen-makefile.sh
+# Autogenerated at 04.07.2022 23:52 using ./gen-makefile.sh

 ##lamp: Apache + php + mariadb
 lamp: apache php mariadb
+
 ##apache: Install apache2 (latest)
 apache:
 	./install/apache
@@ -109,6 +110,6 @@ help: Makefile
 	@echo "Available goals:"
 	@sed -n 's/^##//p' $< | column -t -s ':' |  sed -e "s/^/\t/"

-##<goal>_: Same as 'cat ./install/<goal>.sh'
+##<goal>_: Same as 'cat ./install/<goal>'
 %_:
-	@cat ./install/$*.sh
+	@cat ./install/$*
--- a/README.md
+++ b/README.md
@@ -30,6 +30,9 @@ make help
 ./gen-makefile.sh
 ```

+> I do not recomend to run `make` without arguments.
+> Use `make help` to look around.
+
 ### Selective straightforward installation

 ```shell
@@ -72,3 +75,28 @@ mypackY: goalA goalB
 where:
 * `mypack*` is the pack name
 * `goal*` are script names in `./install`
+
+## Testing in docker (not recommended)
+
+> Note that this is almost useless way to test since you'll meet errors in many cases because dockerized OS is not fully-functional and will never be.
+> 
+> You can use docker to test something **really simple**, e.g. to check general script steps or install cli tools.
+>
+> In other cases you need virtualized Ubuntu instead of dockerized one, so I strongly recommend you to use [VirtualBox](https://www.virtualbox.org/wiki/Downloads) or your host machine.
+
+```shell
+# switch to repo dir
+cd my-env
+
+# build and run container 
+docker build -t myenv . && docker run -it myenv
+
+# or oneliner
+docker run -it $(docker build -q .)
+```
+
+Now you can play around with scripts.
+
+## License
+
+[WTFPLv2](LICENSE)
--- a/gen-makefile.sh
+++ b/gen-makefile.sh
@@ -4,6 +4,7 @@ echo -e "# Autogenerated at $(date +'%d.%m.%Y %H:%M') using ${BASH_SOURCE[0]}\n"

 for file in ./packs/*; do
    cat ${file} >> Makefile
+    echo >> Makefile
 done;

 for file in ./install/*; do
@@ -20,14 +21,13 @@ help: Makefile
 	@echo "Usage:"
 	@echo "\tmake <goal>\n"
 	@echo "Available goals:"
-	@sed -n 's/^##//p' $< | column -t -s ':' |  sed -e "s/^/\t/"
+	@sed -n 's/^##//p' \$< | column -t -s ':' |  sed -e "s/^/\t/"

-##<goal>_: Same as 'cat ./install/<goal>.sh'
+##<goal>_: Same as 'cat ./install/<goal>'
 %_:
-	@cat ./install/\$*.sh
+	@cat ./install/\$*
 EOF

-
 echo "New ./Makefile has been generated!"
 echo "Old one has been saved as ./Makefile.bak"
 echo
--- a/install/apache
+++ b/install/apache
@@ -7,6 +7,6 @@ echo "Installing apache2..."
 echo "==============================================="
 echo

-sudo apt install -y --autoremove apache2
-sudo service apache2 restart
-apache2 -v
+sudo apt install -y --autoremove apache2 && \
+    sudo systemctl restart apache2 && \
+    apache2 -v
--- a/install/apt
+++ b/install/apt
@@ -7,54 +7,56 @@ echo "Installing software from apt..."
 echo "==============================================="
 echo

-sudo apt update && sudo apt upgrade -y --autoremove
-sudo apt install -y --autoremove \
+sudo apt update && \
+    sudo apt upgrade -y --autoremove
+
+sudo apt install -y \
+    alien \
    apt-transport-https \
-    ca-certificates \
-    curl \
-    make \
-    cmake \
-    dialog \
    build-essential \
-    software-properties-common \
-    libaio1 \
-    libssl-dev \
-    libghc-zlib-dev \
-    libcurl4-gnutls-dev \
-    libexpat1-dev \
+    ca-certificates \
+    cmake \
+    curl \
+    dconf-editor \
+    default-jdk \
+    dialog \
    gettext \
    gnupg \
-    ubuntu-restricted-extras \
-    unzip \
-    mc \
-    htop \
-    nano \
-    neofetch \
-    default-jdk \
-    terminator \
-    dconf-editor \
-    alien \
-    meld \
-    vlc \
    gparted \
    hardinfo \
+    htop \
+    libaio1 \
+    libcurl4-gnutls-dev \
+    libexpat1-dev \
+    libghc-zlib-dev \
    libreoffice \
-    pulseeffects \
-    lsp-plugins \
+    libssl-dev \
    lsb-release \
+    lsp-plugins \
+    make \
+    mc \
+    meld \
+    nano \
+    neofetch \
    net-tools \
    nmap \
    p7zip-full \
-    sqlitebrowser
-    # gnome-software \
-    # minder \
-    # redshift \
-    # redshift-gtk \
-    # nodejs \
+    pulseeffects \
+    software-properties-common \
+    sqlitebrowser \
+    terminator \
+    ubuntu-restricted-extras \
+    unzip \
+    vlc \
+    # at \
    # compiz \
    # compizconfig-settings-manager \
+    # deepin-screenshot \
    # earlyoom \
    # etckeeper \
-    # deepin-screenshot \
    # geoclue-2.0 \
-    # at
+    # gnome-software \
+    # minder \
+    # nodejs \
+    # redshift \
+    # redshift-gtk
--- a/install/chrome
+++ b/install/chrome
@@ -9,7 +9,6 @@ echo

 # https://t.me/axenov_blog/251

-# sudo snap install chromium
-wget "https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb" -O /tmp/google-chrome-stable_current_amd64.deb
-sudo dpkg -i /tmp/google-chrome-stable_current_amd64.deb
-rm /tmp/google-chrome-stable_current_amd64.deb
+wget "https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb" -O /tmp/google-chrome-stable_current_amd64.deb && \
+    sudo dpkg -i /tmp/google-chrome-stable_current_amd64.deb && \
+    rm /tmp/google-chrome-stable_current_amd64.deb
--- a/install/composer
+++ b/install/composer
@@ -11,46 +11,31 @@ installed() {
    command -v "$1" >/dev/null 2>&1
 }

-if installed "php"; then
-    if installed "composer"; then
-        echo "WARNING: You already have composer installed - removing to install actual version"
+!installed "php" && echo "WARNING: You need to have php installed"
+
+if installed "composer"; then
+    echo "WARNING: Removing current composer to install its actual version"
    sudo apt remove -y --autoremove composer
    sudo rm -f /bin/composer
    sudo rm -f /usr/bin/composer
    sudo rm -f /usr/local/bin/composer
    sudo rm -rf /usr/src/composer
-    fi
-    sudo mkdir -m 0777 -p /usr/src/composer
-    cd /usr/src/composer
-    # https://getcomposer.org/doc/faqs/how-to-install-composer-programmatically.md
-    EXPECTED_CHECKSUM="$(php -r 'copy("https://composer.github.io/installer.sig", "php://stdout");')"
-    sudo php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-    ACTUAL_CHECKSUM="$(php -r "echo hash_file('sha384', 'composer-setup.php');")"
-    if [ "$EXPECTED_CHECKSUM" != "$ACTUAL_CHECKSUM" ]; then
+fi
+
+sudo mkdir -m 0777 -p /usr/src/composer
+cd /usr/src/composer
+
+# https://getcomposer.org/doc/faqs/how-to-install-composer-programmatically.md
+EXPECTED_CHECKSUM="$(php -r 'copy("https://composer.github.io/installer.sig", "php://stdout");')"
+sudo php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+ACTUAL_CHECKSUM="$(php -r "echo hash_file('sha384', 'composer-setup.php');")"
+if [ "$EXPECTED_CHECKSUM" != "$ACTUAL_CHECKSUM" ]; then
    >&2 echo 'ERROR: Invalid installer checksum'
    rm composer-setup.php
    exit 1
-    fi
-    php composer-setup.php --quiet
-    sudo cp /usr/src/composer/composer.phar /usr/local/bin/composer
-    cd - >/dev/null
-    sudo rm -rf /usr/src/composer/
-    installed "composer" && composer --version
-else
-    echo "WARNING: You need to have php installed"
 fi
-
-# title "Installing composer.phar in home dir..."
-# cd ~
-# EXPECTED_SIGNATURE="$(wget -q -O - https://composer.github.io/installer.sig)"
-# php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-# ACTUAL_SIGNATURE="$(php -r "echo hash_file('sha384', 'composer-setup.php');")"
-# if [ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]
-# then
-#     >&2 echo 'ERROR: Invalid installer signature'
-#     rm composer-setup.php
-#     exit 1
-# fi
-# php composer-setup.php --quiet
-# RESULT=$?
-# rm composer-setup.php
+php composer-setup.php --quiet
+sudo cp /usr/src/composer/composer.phar /usr/local/bin/composer
+cd - >/dev/null
+sudo rm -rf /usr/src/composer/
+installed "composer" && composer --version
Author	SHA1	Message	Date
AnthonyAxenov	82559869fc	Small fixes + WTFPLv2	2022-07-04 23:53:39 +08:00
AnthonyAxenov	4677b84a29	Initial docker sandbox	2022-07-04 23:25:31 +08:00
AnthonyAxenov	7008ec36b7	Apache fix	2022-07-04 23:24:43 +08:00
AnthonyAxenov	f2d41885af	Composer cleanup	2022-07-04 23:24:27 +08:00
AnthonyAxenov	9972fc6d9d	Updated chrome	2022-07-04 22:23:44 +08:00
AnthonyAxenov	f7ef85aad9	Updated apache2	2022-07-04 22:22:57 +08:00
AnthonyAxenov	3043a41365	Sort in apt	2022-07-04 22:22:37 +08:00
AnthonyAxenov	47c1e6d40b	Fixed gen-makefile	2022-07-04 22:22:05 +08:00